diff --git a/setup.py b/setup.py index 104ee10e..c255cb18 100644 --- a/setup.py +++ b/setup.py @@ -94,7 +94,7 @@ crypto_helpers = 'src/borg/crypto/_crypto_helpers.c' chunker_source = 'src/borg/chunker.pyx' hashindex_source = 'src/borg/hashindex.pyx' item_source = 'src/borg/item.pyx' -checksums_source = 'src/borg/algorithms/checksums.pyx' +checksums_source = 'src/borg/checksums.pyx' platform_posix_source = 'src/borg/platform/posix.pyx' platform_linux_source = 'src/borg/platform/linux.pyx' platform_syncfilerange_source = 'src/borg/platform/syncfilerange.pyx' @@ -207,7 +207,7 @@ if not on_rtd: Extension('borg.hashindex', [hashindex_source], extra_compile_args=cflags), Extension('borg.item', [item_source], extra_compile_args=cflags), Extension('borg.chunker', [chunker_source], extra_compile_args=cflags), - Extension('borg.algorithms.checksums', **checksums_ext_kwargs), + Extension('borg.checksums', **checksums_ext_kwargs), ] posix_ext = Extension('borg.platform.posix', [platform_posix_source], extra_compile_args=cflags) diff --git a/src/borg/algorithms/__init__.py b/src/borg/algorithms/__init__.py deleted file mode 100644 index e99ab370..00000000 --- a/src/borg/algorithms/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -""" -borg.algorithms -=============== - -This package is intended for hash and checksum functions. -""" diff --git a/src/borg/archiver.py b/src/borg/archiver.py index bb3f8455..b6923495 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -36,7 +36,7 @@ try: import borg from . import __version__ from . import helpers - from .algorithms.checksums import crc32 + from .checksums import crc32 from .archive import Archive, ArchiveChecker, ArchiveRecreater, Statistics, is_special from .archive import BackupError, BackupOSError, backup_io, OsOpen, stat_update_check from .archive import FilesystemObjectProcessors, TarfileObjectProcessors, MetadataCollector, ChunksProcessor @@ -563,7 +563,7 @@ class Archiver: print(f"{spec:<24} {size:<10} {timeit(func, number=100):.3f}s") import zlib - from borg.algorithms.checksums import crc32, deflate_crc32, xxh64 + from borg.checksums import crc32, deflate_crc32, xxh64 print("Non-cryptographic checksums / hashes ===========================") size = "1GB" tests = [ diff --git a/src/borg/algorithms/checksums.pyx b/src/borg/checksums.pyx similarity index 97% rename from src/borg/algorithms/checksums.pyx rename to src/borg/checksums.pyx index 1d15157d..b3372b8c 100644 --- a/src/borg/algorithms/checksums.pyx +++ b/src/borg/checksums.pyx @@ -1,7 +1,7 @@ import zlib -from ..platformflags import is_darwin -from ..helpers import bin_to_hex +from .platformflags import is_darwin +from .helpers import bin_to_hex from libc.stdint cimport uint32_t from cpython.buffer cimport PyBUF_SIMPLE, PyObject_GetBuffer, PyBuffer_Release diff --git a/src/borg/crypto/file_integrity.py b/src/borg/crypto/file_integrity.py index 87518a2a..aa2d78d1 100644 --- a/src/borg/crypto/file_integrity.py +++ b/src/borg/crypto/file_integrity.py @@ -6,7 +6,7 @@ from hmac import compare_digest from ..helpers import IntegrityError from ..logger import create_logger -from ..algorithms.checksums import StreamingXXH64 +from ..checksums import StreamingXXH64 logger = create_logger() diff --git a/src/borg/helpers/parseformat.py b/src/borg/helpers/parseformat.py index ee32abd7..f595c8d3 100644 --- a/src/borg/helpers/parseformat.py +++ b/src/borg/helpers/parseformat.py @@ -751,7 +751,7 @@ class ItemFormatter(BaseFormatter): return any(key in cls.KEYS_REQUIRING_CACHE for key in format_keys) def __init__(self, archive, format, *, json_lines=False): - from ..algorithms.checksums import StreamingXXH64 + from ..checksums import StreamingXXH64 self.xxh64 = StreamingXXH64 self.archive = archive self.json_lines = json_lines diff --git a/src/borg/remote.py b/src/borg/remote.py index fa0772c6..2870d71d 100644 --- a/src/borg/remote.py +++ b/src/borg/remote.py @@ -31,7 +31,7 @@ from .logger import create_logger, setup_logging from .helpers import msgpack from .repository import Repository from .version import parse_version, format_version -from .algorithms.checksums import xxh64 +from .checksums import xxh64 from .helpers.datastruct import EfficientCollectionQueue logger = create_logger(__name__) diff --git a/src/borg/repository.py b/src/borg/repository.py index 53ac9a1c..e60a3d59 100644 --- a/src/borg/repository.py +++ b/src/borg/repository.py @@ -25,7 +25,7 @@ from .locking import Lock, LockError, LockErrorT from .logger import create_logger from .lrucache import LRUCache from .platform import SaveFile, SyncFile, sync_dir, safe_fadvise -from .algorithms.checksums import crc32 +from .checksums import crc32 from .crypto.file_integrity import IntegrityCheckedFile, FileIntegrityError logger = create_logger(__name__) diff --git a/src/borg/testsuite/checksums.py b/src/borg/testsuite/checksums.py index a6322a09..2513d7a5 100644 --- a/src/borg/testsuite/checksums.py +++ b/src/borg/testsuite/checksums.py @@ -4,7 +4,7 @@ from binascii import unhexlify import pytest -from ..algorithms import checksums +from .. import checksums from ..helpers import bin_to_hex crc32_implementations = [checksums.deflate_crc32]