This commit is contained in:
Thomas Waldmann 2023-07-26 00:19:37 +02:00
parent 3017701958
commit 35ac39b751
No known key found for this signature in database
GPG Key ID: 243ACFA951F78E01
18 changed files with 29 additions and 42 deletions

View File

@ -95,7 +95,7 @@ ignore = W503, E203, F405
# with existing code. if you want to change them, you should first fix all
# flake8 failures that appear with your change.
per_file_ignores =
src/borg/archive.py:E402,E501,F401
src/borg/archive.py:E402,E501
src/borg/archiver/__init__.py:E402,E741
src/borg/archiver/_common.py:E501
src/borg/archiver/help_cmd.py:E501
@ -104,32 +104,23 @@ per_file_ignores =
src/borg/fuse.py:E402
src/borg/manifest.py:E402,E501
src/borg/remote.py:E501
src/borg/repository.py:E501,F401
src/borg/repository.py:E501
src/borg/xattr.py:E402
src/borg/crypto/key.py:E402,F401
src/borg/crypto/keymanager.py:F401
src/borg/crypto/key.py:E402
src/borg/helpers/__init__.py:F401
src/borg/helpers/checks.py:F401
src/borg/helpers/misc.py:E402,F401
src/borg/helpers/parseformat.py:E402,E501,E741,F401
src/borg/helpers/process.py:E402,F401
src/borg/helpers/misc.py:E402
src/borg/helpers/parseformat.py:E402,E501,E741
src/borg/helpers/process.py:E402
src/borg/helpers/shellpattern.py:E501
src/borg/platform/__init__.py:F401
src/borg/platform/base.py:E402
src/borg/testsuite/__init__.py:F401
src/borg/testsuite/archiver/__init__.py:F401
src/borg/testsuite/archiver/disk_full.py:F401,F811
src/borg/testsuite/archiver/return_codes.py:F401,F811
src/borg/testsuite/benchmark.py:F401,F811
src/borg/testsuite/chunker_pytest.py:F401
src/borg/testsuite/archiver/disk_full.py:F811
src/borg/testsuite/archiver/return_codes.py:F811
src/borg/testsuite/benchmark.py:F811
src/borg/testsuite/crypto.py:E501,E741
src/borg/testsuite/file_integrity.py:F401
src/borg/testsuite/hashindex.py:F401
src/borg/testsuite/helpers.py:E501,F401
src/borg/testsuite/key.py:F401
src/borg/testsuite/locking.py:E501,F401
src/borg/testsuite/platform.py:E501,F401,F811
src/borg/testsuite/repository.py:F401
src/borg/testsuite/helpers.py:E501
src/borg/testsuite/locking.py:E501
src/borg/testsuite/platform.py:E501,F811
max_line_length = 120
exclude = build,dist,.git,.idea,.cache,.tox

View File

@ -6,7 +6,7 @@ import sys
import time
from collections import OrderedDict, defaultdict
from contextlib import contextmanager
from datetime import datetime, timedelta
from datetime import timedelta
from functools import partial
from getpass import getuser
from io import BytesIO
@ -22,7 +22,7 @@ logger = create_logger()
from . import xattr
from .chunker import get_chunker, Chunk
from .cache import ChunkListEntry
from .crypto.key import key_factory, UnsupportedPayloadError, AEADKeyBase
from .crypto.key import key_factory, UnsupportedPayloadError
from .compress import Compressor, CompressionSpec
from .constants import * # NOQA
from .crypto.low_level import IntegrityError as IntegrityErrorBase

View File

@ -158,7 +158,7 @@ class KeyManager:
def import_paperkey(self, args):
try:
# imported here because it has global side effects
import readline
import readline # noqa
except ImportError:
print("Note: No line editing available due to missing readline support")

View File

@ -1,7 +1,7 @@
import os
from .errors import Error
from ..platformflags import is_win32, is_linux, is_freebsd, is_darwin
from ..platformflags import is_win32
class PythonLibcTooOld(Error):

View File

@ -13,7 +13,6 @@ logger = create_logger()
from . import msgpack
from .. import __version__ as borg_version
from .. import chunker
def sysinfo():

View File

@ -9,7 +9,7 @@ import re
import shlex
import stat
import uuid
from typing import List, Dict, Set, Tuple, ClassVar, Any, TYPE_CHECKING, Literal
from typing import Dict, Set, Tuple, ClassVar, Any, TYPE_CHECKING, Literal
from binascii import hexlify
from collections import Counter, OrderedDict
from datetime import datetime, timezone
@ -27,7 +27,6 @@ from .time import OutputTimestamp, format_time, safe_timestamp
from .. import __version__ as borg_version
from .. import __version_tuple__ as borg_version_tuple
from ..constants import * # NOQA
from ..platformflags import is_win32
if TYPE_CHECKING:
from ..item import ItemDiff

View File

@ -1,7 +1,6 @@
import contextlib
import os
import os.path
import re
import shlex
import signal
import subprocess
@ -11,7 +10,7 @@ import traceback
from .. import __version__
from ..platformflags import is_win32, is_linux, is_freebsd, is_darwin
from ..platformflags import is_win32
from ..logger import create_logger
logger = create_logger()

View File

@ -19,7 +19,7 @@ try:
except: # noqa
raises = None
from ..fuse_impl import llfuse, has_llfuse, has_pyfuse3
from ..fuse_impl import llfuse, has_llfuse, has_pyfuse3 # NOQA
from .. import platform
from ..platformflags import is_win32

View File

@ -5,7 +5,7 @@ import time
from ...constants import * # NOQA
from .. import are_symlinks_supported, are_hardlinks_supported
from ..platform import is_win32, is_darwin
from ...platformflags import is_win32, is_darwin
from . import cmd, create_regular_file, RK_ENCRYPTION, assert_line_exists, generate_archiver_tests
pytest_generate_tests = lambda metafunc: generate_archiver_tests(metafunc, kinds="local,remote,binary") # NOQA

View File

@ -22,7 +22,7 @@ import shutil
import pytest
from ...constants import * # NOQA
from . import cmd_fixture
from . import cmd_fixture # NOQA
DF_MOUNT = "/tmp/borg-mount"

View File

@ -13,7 +13,7 @@ from ...helpers import EXIT_WARNING
from ...helpers import flags_noatime, flags_normal
from .. import changedir, same_ts_ns
from .. import are_symlinks_supported, are_hardlinks_supported, is_utime_fully_supported, is_birthtime_fully_supported
from ..platform import is_darwin, is_win32
from ...platformflags import is_darwin, is_win32
from . import (
RK_ENCRYPTION,
requires_hardlinks,

View File

@ -1,5 +1,5 @@
from ...constants import * # NOQA
from . import cmd_fixture, changedir
from . import cmd_fixture, changedir # NOQA
def test_return_codes(cmd_fixture, tmpdir):

View File

@ -10,7 +10,7 @@ import os
import pytest
from .archiver import changedir, cmd_fixture
from .archiver import changedir, cmd_fixture # NOQA
from .item import Item
from ..constants import zeros

View File

@ -1,6 +1,6 @@
import pytest
from ..crypto.file_integrity import IntegrityCheckedFile, DetachedIntegrityCheckedFile, FileIntegrityError
from ..crypto.file_integrity import DetachedIntegrityCheckedFile, FileIntegrityError
class TestReadIntegrityFile:

View File

@ -8,7 +8,7 @@ import os
import tempfile
import zlib
from ..hashindex import NSIndex, ChunkIndex, ChunkIndexEntry
from ..hashindex import NSIndex, ChunkIndex
from ..crypto.file_integrity import IntegrityCheckedFile, FileIntegrityError
from . import BaseTestCase, unopened_tempfile

View File

@ -45,7 +45,7 @@ from ..helpers import eval_escapes
from ..helpers import safe_unlink
from ..helpers import text_to_json, binary_to_json
from ..helpers.passphrase import Passphrase, PasswordRetriesExceeded
from ..platform import is_cygwin, is_win32, is_darwin, swidth
from ..platform import is_cygwin, is_win32, is_darwin
from . import BaseTestCase, FakeInputs, are_hardlinks_supported
from . import rejected_dotdot_paths

View File

@ -1,4 +1,3 @@
import re
import tempfile
from binascii import hexlify, unhexlify, a2b_base64
from unittest.mock import MagicMock

View File

@ -5,11 +5,11 @@ import sys
import tempfile
import unittest
from ..platformflags import is_win32, is_linux, is_freebsd, is_darwin
from ..platformflags import is_win32
from ..platform import acl_get, acl_set, swidth
from ..platform import get_process_id, process_alive
from . import BaseTestCase, unopened_tempfile
from .locking import free_pid
from .locking import free_pid # NOQA
ACCESS_ACL = """