diff --git a/src/borg/archiver/_common.py b/src/borg/archiver/_common.py index 6c04f1667..a6d3e57ac 100644 --- a/src/borg/archiver/_common.py +++ b/src/borg/archiver/_common.py @@ -1,4 +1,3 @@ -import argparse import functools import os import textwrap @@ -211,7 +210,8 @@ def with_other_repository(manifest=False, cache=False, compatibility=None): acceptable_versions = (1, 2) if v1_or_v2 else (3,) if repository.version not in acceptable_versions: raise Error( - f"This borg version only accepts version {' or '.join(acceptable_versions)} repos for --other-repo." + f"This borg version only accepts version {' or '.join(acceptable_versions)} " + f"repos for --other-repo." ) kwargs["other_repository"] = repository if manifest or cache: diff --git a/src/borg/crypto/keymanager.py b/src/borg/crypto/keymanager.py index fe5050f55..63335c445 100644 --- a/src/borg/crypto/keymanager.py +++ b/src/borg/crypto/keymanager.py @@ -3,12 +3,7 @@ import pkgutil import textwrap from hashlib import sha256 -from borgstore.store import ObjectNotFound as StoreObjectNotFound - from ..helpers import Error, yes, bin_to_hex, hex_to_bin, dash_open -from ..manifest import Manifest, NoManifestError -from ..repository3 import Repository3 -from ..repository import Repository from ..repoobj import RepoObj diff --git a/src/borg/testsuite/cache.py b/src/borg/testsuite/cache.py index 28846d0ad..b9959687b 100644 --- a/src/borg/testsuite/cache.py +++ b/src/borg/testsuite/cache.py @@ -1,8 +1,5 @@ -import io import os.path -from ..helpers.msgpack import packb - import pytest from .hashindex import H