split helpers import into multiple ones

src/borg/archive.py

@@ -1,7 +1,7 @@
+import errno
 from datetime import datetime, timezone
 from getpass import getuser
 from itertools import groupby
-import errno
 
 from .logger import create_logger
 logger = create_logger()
@@ -16,15 +16,20 @@ import sys
 import time
 from io import BytesIO
 from . import xattr
-from .compress import COMPR_BUFFER
 from .constants import *  # NOQA
-from .helpers import Chunk, Error, uid2user, user2uid, gid2group, group2gid, \
-    parse_timestamp, to_localtime, format_time, format_timedelta, safe_encode, safe_decode, \
-    Manifest, decode_dict, make_path_safe, StableDict, int_to_bigint, bigint_to_int, bin_to_hex, \
-    ProgressIndicatorPercent, ChunkIteratorFileWrapper, remove_surrogates, log_multi, \
-    PathPrefixPattern, FnmatchPattern, open_item, file_status, format_file_size, consume, \
-    CompressionDecider1, CompressionDecider2, CompressionSpec, \
-    IntegrityError
+from .helpers import Manifest
+from .helpers import Chunk, ChunkIteratorFileWrapper, open_item
+from .helpers import Error, IntegrityError
+from .helpers import uid2user, user2uid, gid2group, group2gid
+from .helpers import parse_timestamp, to_localtime
+from .helpers import format_time, format_timedelta, format_file_size, file_status
+from .helpers import safe_encode, safe_decode, make_path_safe, remove_surrogates
+from .helpers import decode_dict, StableDict
+from .helpers import int_to_bigint, bigint_to_int, bin_to_hex
+from .helpers import ProgressIndicatorPercent, log_multi
+from .helpers import PathPrefixPattern, FnmatchPattern
+from .helpers import consume
+from .helpers import CompressionDecider1, CompressionDecider2, CompressionSpec
 from .repository import Repository
 from .platform import acl_get, acl_set, set_flags, get_flags, swidth
 from .chunker import Chunker

src/borg/archiver.py

@@ -20,12 +20,18 @@ import textwrap
 import traceback
 
 from . import __version__
-from .helpers import Error, location_validator, archivename_validator, format_time, format_file_size, \
-    parse_pattern, PathPrefixPattern, to_localtime, timestamp, \
-    get_cache_dir, prune_within, prune_split, bin_to_hex, safe_encode, \
-    Manifest, remove_surrogates, update_excludes, format_archive, check_extension_modules, \
-    dir_is_tagged, ChunkerParams, CompressionSpec, is_slow_msgpack, yes, sysinfo, \
-    log_multi, PatternMatcher, ItemFormatter
+from .helpers import Error
+from .helpers import location_validator, archivename_validator, ChunkerParams, CompressionSpec
+from .helpers import ItemFormatter, format_time, format_file_size, format_archive
+from .helpers import safe_encode, remove_surrogates, bin_to_hex
+from .helpers import prune_within, prune_split
+from .helpers import to_localtime, timestamp
+from .helpers import get_cache_dir
+from .helpers import Manifest
+from .helpers import update_excludes, check_extension_modules
+from .helpers import dir_is_tagged, is_slow_msgpack, yes, sysinfo
+from .helpers import log_multi
+from .helpers import parse_pattern, PatternMatcher, PathPrefixPattern
 from .logger import create_logger, setup_logging
 logger = create_logger()
 from . import helpers

src/borg/cache.py

@@ -9,8 +9,11 @@ import shutil
 from .key import PlaintextKey
 from .logger import create_logger
 logger = create_logger()
-from .helpers import Error, get_cache_dir, decode_dict, int_to_bigint, \
-    bigint_to_int, bin_to_hex, format_file_size, yes
+from .helpers import Error
+from .helpers import get_cache_dir
+from .helpers import decode_dict, int_to_bigint, bigint_to_int, bin_to_hex
+from .helpers import format_file_size
+from .helpers import yes
 from .locking import UpgradableLock
 from .hashindex import ChunkIndex, ChunkIndexEntry
 

src/borg/fuse.py

@@ -7,7 +7,8 @@ import stat
 import tempfile
 import time
 from .archive import Archive
-from .helpers import daemonize, bigint_to_int
+from .helpers import daemonize
+from .helpers import bigint_to_int
 from .logger import create_logger
 from .lrucache import LRUCache
 from distutils.version import LooseVersion

src/borg/item.py

@@ -1,5 +1,7 @@
 from .constants import ITEM_KEYS
-from .helpers import safe_encode, safe_decode, bigint_to_int, int_to_bigint, StableDict
+from .helpers import safe_encode, safe_decode
+from .helpers import bigint_to_int, int_to_bigint
+from .helpers import StableDict
 
 
 class PropDict:

src/borg/key.py

@@ -7,7 +7,12 @@ import textwrap
 from hmac import compare_digest
 from hashlib import sha256, pbkdf2_hmac
 
-from .helpers import Chunk, IntegrityError, get_keys_dir, Error, yes, bin_to_hex, CompressionDecider2, CompressionSpec
+from .helpers import Chunk
+from .helpers import Error, IntegrityError
+from .helpers import yes
+from .helpers import get_keys_dir
+from .helpers import bin_to_hex
+from .helpers import CompressionDecider2, CompressionSpec
 from .logger import create_logger
 logger = create_logger()
 

src/borg/locking.py

@@ -3,7 +3,7 @@ import os
 import socket
 import time
 
-from borg.helpers import Error, ErrorWithTraceback
+from .helpers import Error, ErrorWithTraceback
 
 ADD, REMOVE = 'add', 'remove'
 SHARED, EXCLUSIVE = 'shared', 'exclusive'

src/borg/platform_darwin.pyx

@@ -1,5 +1,8 @@
 import os
-from .helpers import user2uid, group2gid, safe_decode, safe_encode
+
+from .helpers import user2uid, group2gid
+from .helpers import safe_decode, safe_encode
+
 from .platform_posix import swidth
 
 API_VERSION = 3

src/borg/platform_freebsd.pyx

@@ -1,5 +1,8 @@
 import os
-from .helpers import posix_acl_use_stored_uid_gid, safe_encode, safe_decode
+
+from .helpers import posix_acl_use_stored_uid_gid
+from .helpers import safe_encode, safe_decode
+
 from .platform_posix import swidth
 
 API_VERSION = 3

src/borg/platform_linux.pyx

@@ -3,7 +3,9 @@ import re
 import resource
 import stat
 
-from .helpers import posix_acl_use_stored_uid_gid, user2uid, group2gid, safe_decode, safe_encode
+from .helpers import posix_acl_use_stored_uid_gid
+from .helpers import user2uid, group2gid
+from .helpers import safe_decode, safe_encode
 from .platform_base import SyncFile as BaseSyncFile
 from .platform_posix import swidth
 

src/borg/remote.py

@@ -10,7 +10,10 @@ import tempfile
 
 from . import __version__
 
-from .helpers import Error, IntegrityError, get_home_dir, sysinfo, bin_to_hex
+from .helpers import Error, IntegrityError
+from .helpers import get_home_dir
+from .helpers import sysinfo
+from .helpers import bin_to_hex
 from .repository import Repository
 
 import msgpack

src/borg/repository.py

@@ -15,8 +15,10 @@ from zlib import crc32
 
 import msgpack
 from .constants import *  # NOQA
-from .helpers import Error, ErrorWithTraceback, IntegrityError, InternalOSError, Location, ProgressIndicatorPercent, \
-    bin_to_hex
+from .helpers import Error, ErrorWithTraceback, IntegrityError, InternalOSError
+from .helpers import Location
+from .helpers import ProgressIndicatorPercent
+from .helpers import bin_to_hex
 from .hashindex import NSIndex
 from .locking import UpgradableLock, LockError, LockErrorT
 from .lrucache import LRUCache

src/borg/testsuite/archiver.py

@@ -24,7 +24,9 @@ from ..archiver import Archiver
 from ..cache import Cache
 from ..constants import *  # NOQA
 from ..crypto import bytes_to_long, num_aes_blocks
-from ..helpers import Chunk, Manifest, EXIT_SUCCESS, EXIT_WARNING, EXIT_ERROR, bin_to_hex
+from ..helpers import Chunk, Manifest
+from ..helpers import EXIT_SUCCESS, EXIT_WARNING, EXIT_ERROR
+from ..helpers import bin_to_hex
 from ..key import KeyfileKeyBase
 from ..remote import RemoteRepository, PathNotAllowed
 from ..repository import Repository

src/borg/testsuite/helpers.py

@@ -11,13 +11,19 @@ import msgpack
 import msgpack.fallback
 import time
 
-from ..helpers import Location, format_file_size, format_timedelta, make_path_safe, clean_lines, \
-    prune_within, prune_split, get_cache_dir, get_keys_dir, is_slow_msgpack, \
-    yes, TRUISH, FALSISH, DEFAULTISH, \
-    StableDict, int_to_bigint, bigint_to_int, bin_to_hex, parse_timestamp, ChunkerParams, Chunk, \
-    ProgressIndicatorPercent, ProgressIndicatorEndless, load_excludes, parse_pattern, \
-    CompressionSpec, CompressionDecider1, CompressionDecider2, \
-    PatternMatcher, RegexPattern, PathPrefixPattern, FnmatchPattern, ShellPattern, partial_format, ChunkIteratorFileWrapper
+from ..helpers import Location
+from ..helpers import partial_format, format_file_size, format_timedelta
+from ..helpers import make_path_safe, clean_lines
+from ..helpers import prune_within, prune_split
+from ..helpers import get_cache_dir, get_keys_dir
+from ..helpers import is_slow_msgpack
+from ..helpers import yes, TRUISH, FALSISH, DEFAULTISH
+from ..helpers import StableDict, int_to_bigint, bigint_to_int, bin_to_hex
+from ..helpers import parse_timestamp, ChunkIteratorFileWrapper, ChunkerParams, Chunk
+from ..helpers import ProgressIndicatorPercent, ProgressIndicatorEndless
+from ..helpers import load_excludes
+from ..helpers import CompressionSpec, CompressionDecider1, CompressionDecider2
+from ..helpers import parse_pattern, PatternMatcher, RegexPattern, PathPrefixPattern, FnmatchPattern, ShellPattern
 from . import BaseTestCase, environment_variable, FakeInputs
 
 

src/borg/testsuite/key.py

@@ -9,7 +9,9 @@ import pytest
 
 from ..crypto import bytes_to_long, num_aes_blocks
 from ..key import PlaintextKey, PassphraseKey, KeyfileKey, Passphrase, PasswordRetriesExceeded, bin_to_hex
-from ..helpers import Location, Chunk, IntegrityError
+from ..helpers import Location
+from ..helpers import Chunk
+from ..helpers import IntegrityError
 
 
 @pytest.fixture(autouse=True)

src/borg/testsuite/repository.py

@@ -7,7 +7,8 @@ import tempfile
 from unittest.mock import patch
 
 from ..hashindex import NSIndex
-from ..helpers import Location, IntegrityError, InternalOSError
+from ..helpers import Location
+from ..helpers import IntegrityError, InternalOSError
 from ..locking import UpgradableLock, LockFailed
 from ..remote import RemoteRepository, InvalidRPCMethod, ConnectionClosedWithHint, handle_remote_line
 from ..repository import Repository, LoggedIO, MAGIC

src/borg/upgrader.py

@@ -5,7 +5,8 @@ import os
 import shutil
 import time
 
-from .helpers import get_home_dir, get_keys_dir, get_cache_dir, ProgressIndicatorPercent
+from .helpers import get_home_dir, get_keys_dir, get_cache_dir
+from .helpers import ProgressIndicatorPercent
 from .locking import UpgradableLock
 from .repository import Repository, MAGIC
 from .key import KeyfileKey, KeyfileNotFoundError