From b7eaeee26631f145a2b7d73f73f20fb56314c3a8 Mon Sep 17 00:00:00 2001 From: Marian Beermann Date: Sat, 3 Dec 2016 17:50:50 +0100 Subject: [PATCH] clean imports, remove unused code --- src/borg/archive.py | 7 +++---- src/borg/archiver.py | 2 +- src/borg/helpers.py | 20 +------------------- src/borg/key.py | 2 +- src/borg/testsuite/helpers.py | 16 ++-------------- 5 files changed, 8 insertions(+), 39 deletions(-) diff --git a/src/borg/archive.py b/src/borg/archive.py index 8f97442e7..ee3b0976c 100644 --- a/src/borg/archive.py +++ b/src/borg/archive.py @@ -29,12 +29,11 @@ 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, swidth_slice -from .helpers import decode_dict, StableDict -from .helpers import int_to_bigint, bigint_to_int, bin_to_hex +from .helpers import safe_encode, safe_decode, make_path_safe, remove_surrogates +from .helpers import StableDict +from .helpers import bin_to_hex from .helpers import ellipsis_truncate, ProgressIndicatorPercent, log_multi from .helpers import PathPrefixPattern, FnmatchPattern -from .helpers import consume, chunkit from .helpers import CompressionDecider1, CompressionDecider2, CompressionSpec from .item import Item, ArchiveItem from .key import key_factory diff --git a/src/borg/archiver.py b/src/borg/archiver.py index f7effe5a2..7c51d034a 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -24,7 +24,7 @@ logger = create_logger() from . import __version__ from . import helpers from .archive import Archive, ArchiveChecker, ArchiveRecreater, Statistics, is_special -from .archive import BackupOSError, CHUNKER_PARAMS +from .archive import BackupOSError from .cache import Cache from .constants import * # NOQA from .helpers import EXIT_SUCCESS, EXIT_WARNING, EXIT_ERROR diff --git a/src/borg/helpers.py b/src/borg/helpers.py index 0b2e016b5..cd6af5cd8 100644 --- a/src/borg/helpers.py +++ b/src/borg/helpers.py @@ -693,7 +693,7 @@ def SortBySpec(text): def safe_timestamp(item_timestamp_ns): try: - return datetime.fromtimestamp(bigint_to_int(item_timestamp_ns) / 1e9) + return datetime.fromtimestamp(item_timestamp_ns / 1e9) except OverflowError: # likely a broken file time and datetime did not want to go beyond year 9999 return datetime(9999, 12, 31, 23, 59, 59) @@ -1092,24 +1092,6 @@ class StableDict(dict): return sorted(super().items()) -def bigint_to_int(mtime): - """Convert bytearray to int - """ - if isinstance(mtime, bytes): - return int.from_bytes(mtime, 'little', signed=True) - return mtime - - -def int_to_bigint(value): - """Convert integers larger than 64 bits to bytearray - - Smaller integers are left alone - """ - if value.bit_length() > 63: - return value.to_bytes((value.bit_length() + 9) // 8, 'little', signed=True) - return value - - def is_slow_msgpack(): return msgpack.Packer is msgpack.fallback.Packer diff --git a/src/borg/key.py b/src/borg/key.py index bec595da9..3a8168db0 100644 --- a/src/borg/key.py +++ b/src/borg/key.py @@ -14,7 +14,7 @@ logger = create_logger() from .constants import * # NOQA from .compress import Compressor, get_compressor -from .crypto import AES, bytes_to_long, long_to_bytes, bytes_to_int, num_aes_blocks, hmac_sha256, blake2b_256 +from .crypto import AES, bytes_to_long, bytes_to_int, num_aes_blocks, hmac_sha256, blake2b_256 from .helpers import Chunk from .helpers import Error, IntegrityError from .helpers import yes diff --git a/src/borg/testsuite/helpers.py b/src/borg/testsuite/helpers.py index de19a35ae..8c5306e87 100644 --- a/src/borg/testsuite/helpers.py +++ b/src/borg/testsuite/helpers.py @@ -18,7 +18,7 @@ from ..helpers import prune_within, prune_split from ..helpers import get_cache_dir, get_keys_dir, get_security_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 StableDict, bin_to_hex from ..helpers import parse_timestamp, ChunkIteratorFileWrapper, ChunkerParams, Chunk from ..helpers import ProgressIndicatorPercent, ProgressIndicatorEndless from ..helpers import load_excludes @@ -27,19 +27,7 @@ from ..helpers import parse_pattern, PatternMatcher, RegexPattern, PathPrefixPat from ..helpers import swidth_slice from ..helpers import chunkit -from . import BaseTestCase, environment_variable, FakeInputs - - -class BigIntTestCase(BaseTestCase): - - def test_bigint(self): - self.assert_equal(int_to_bigint(0), 0) - self.assert_equal(int_to_bigint(2**63-1), 2**63-1) - self.assert_equal(int_to_bigint(-2**63+1), -2**63+1) - self.assert_equal(int_to_bigint(2**63), b'\x00\x00\x00\x00\x00\x00\x00\x80\x00') - self.assert_equal(int_to_bigint(-2**63), b'\x00\x00\x00\x00\x00\x00\x00\x80\xff') - self.assert_equal(bigint_to_int(int_to_bigint(-2**70)), -2**70) - self.assert_equal(bigint_to_int(int_to_bigint(2**70)), 2**70) +from . import BaseTestCase, FakeInputs def test_bin_to_hex():