summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThomas Waldmann <tw@waldmann-edv.de>2023-07-26 00:19:37 +0200
committerThomas Waldmann <tw@waldmann-edv.de>2023-07-26 01:23:37 +0200
commit35ac39b7514f0fe2e4bf93b578f6afbbf838c9cd (patch)
tree1a2670aeb0d5645c02bd71c9b7c95a8862d4dd5b /src
parent3017701958108f0db241ff32e65b70d59180c023 (diff)
fix F401
Diffstat (limited to 'src')
-rw-r--r--src/borg/archive.py4
-rw-r--r--src/borg/crypto/keymanager.py2
-rw-r--r--src/borg/helpers/checks.py2
-rw-r--r--src/borg/helpers/misc.py1
-rw-r--r--src/borg/helpers/parseformat.py3
-rw-r--r--src/borg/helpers/process.py3
-rw-r--r--src/borg/testsuite/__init__.py2
-rw-r--r--src/borg/testsuite/archiver/diff_cmd.py2
-rw-r--r--src/borg/testsuite/archiver/disk_full.py2
-rw-r--r--src/borg/testsuite/archiver/extract_cmd.py2
-rw-r--r--src/borg/testsuite/archiver/return_codes.py2
-rw-r--r--src/borg/testsuite/benchmark.py2
-rw-r--r--src/borg/testsuite/file_integrity.py2
-rw-r--r--src/borg/testsuite/hashindex.py2
-rw-r--r--src/borg/testsuite/helpers.py2
-rw-r--r--src/borg/testsuite/key.py1
-rw-r--r--src/borg/testsuite/platform.py4
17 files changed, 17 insertions, 21 deletions
diff --git a/src/borg/archive.py b/src/borg/archive.py
index 2b4b1c2bb..60c647da8 100644
--- a/src/borg/archive.py
+++ b/src/borg/archive.py
@@ -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
diff --git a/src/borg/crypto/keymanager.py b/src/borg/crypto/keymanager.py
index 1b6a49e63..eb4962bf0 100644
--- a/src/borg/crypto/keymanager.py
+++ b/src/borg/crypto/keymanager.py
@@ -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")
diff --git a/src/borg/helpers/checks.py b/src/borg/helpers/checks.py
index 74b50a03f..acc38ffb4 100644
--- a/src/borg/helpers/checks.py
+++ b/src/borg/helpers/checks.py
@@ -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):
diff --git a/src/borg/helpers/misc.py b/src/borg/helpers/misc.py
index f28779a1e..d844b7634 100644
--- a/src/borg/helpers/misc.py
+++ b/src/borg/helpers/misc.py
@@ -13,7 +13,6 @@ logger = create_logger()
from . import msgpack
from .. import __version__ as borg_version
-from .. import chunker
def sysinfo():
diff --git a/src/borg/helpers/parseformat.py b/src/borg/helpers/parseformat.py
index 21737b861..ce43e99f5 100644
--- a/src/borg/helpers/parseformat.py
+++ b/src/borg/helpers/parseformat.py
@@ -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
diff --git a/src/borg/helpers/process.py b/src/borg/helpers/process.py
index c44d122ef..ff828f30a 100644
--- a/src/borg/helpers/process.py
+++ b/src/borg/helpers/process.py
@@ -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()
diff --git a/src/borg/testsuite/__init__.py b/src/borg/testsuite/__init__.py
index 3029fae1a..7e7d47600 100644
--- a/src/borg/testsuite/__init__.py
+++ b/src/borg/testsuite/__init__.py
@@ -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
diff --git a/src/borg/testsuite/archiver/diff_cmd.py b/src/borg/testsuite/archiver/diff_cmd.py
index 836bfecfe..c87f4bf0b 100644
--- a/src/borg/testsuite/archiver/diff_cmd.py
+++ b/src/borg/testsuite/archiver/diff_cmd.py
@@ -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
diff --git a/src/borg/testsuite/archiver/disk_full.py b/src/borg/testsuite/archiver/disk_full.py
index f54bc7018..5f85a2931 100644
--- a/src/borg/testsuite/archiver/disk_full.py
+++ b/src/borg/testsuite/archiver/disk_full.py
@@ -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"
diff --git a/src/borg/testsuite/archiver/extract_cmd.py b/src/borg/testsuite/archiver/extract_cmd.py
index f9ee3b003..46d4d26db 100644
--- a/src/borg/testsuite/archiver/extract_cmd.py
+++ b/src/borg/testsuite/archiver/extract_cmd.py
@@ -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,
diff --git a/src/borg/testsuite/archiver/return_codes.py b/src/borg/testsuite/archiver/return_codes.py
index 74161cccb..05fa22200 100644
--- a/src/borg/testsuite/archiver/return_codes.py
+++ b/src/borg/testsuite/archiver/return_codes.py
@@ -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):
diff --git a/src/borg/testsuite/benchmark.py b/src/borg/testsuite/benchmark.py
index 226c97c48..7c4943b80 100644
--- a/src/borg/testsuite/benchmark.py
+++ b/src/borg/testsuite/benchmark.py
@@ -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
diff --git a/src/borg/testsuite/file_integrity.py b/src/borg/testsuite/file_integrity.py
index 8249d8e6b..95add54ef 100644
--- a/src/borg/testsuite/file_integrity.py
+++ b/src/borg/testsuite/file_integrity.py
@@ -1,6 +1,6 @@
import pytest
-from ..crypto.file_integrity import IntegrityCheckedFile, DetachedIntegrityCheckedFile, FileIntegrityError
+from ..crypto.file_integrity import DetachedIntegrityCheckedFile, FileIntegrityError
class TestReadIntegrityFile:
diff --git a/src/borg/testsuite/hashindex.py b/src/borg/testsuite/hashindex.py
index 6ae3e179b..54e56e5f3 100644
--- a/src/borg/testsuite/hashindex.py
+++ b/src/borg/testsuite/hashindex.py
@@ -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
diff --git a/src/borg/testsuite/helpers.py b/src/borg/testsuite/helpers.py
index ff2cc6306..03070802d 100644
--- a/src/borg/testsuite/helpers.py
+++ b/src/borg/testsuite/helpers.py
@@ -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
diff --git a/src/borg/testsuite/key.py b/src/borg/testsuite/key.py
index 3d3292fc1..94a3765c1 100644
--- a/src/borg/testsuite/key.py
+++ b/src/borg/testsuite/key.py
@@ -1,4 +1,3 @@
-import re
import tempfile
from binascii import hexlify, unhexlify, a2b_base64
from unittest.mock import MagicMock
diff --git a/src/borg/testsuite/platform.py b/src/borg/testsuite/platform.py
index 598a8b5b6..f1de49de9 100644
--- a/src/borg/testsuite/platform.py
+++ b/src/borg/testsuite/platform.py
@@ -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 = """