Browse Source

move lrucache module to borg.helpers

Thomas Waldmann 3 years ago
parent
commit
578639b35e

+ 2 - 2
src/borg/archive.py

@@ -13,7 +13,7 @@ from io import BytesIO
 from itertools import groupby, zip_longest
 from shutil import get_terminal_size
 
-from .platformflags import is_win32, is_linux, is_freebsd, is_darwin
+from .platformflags import is_win32
 from .logger import create_logger
 
 logger = create_logger()
@@ -41,7 +41,7 @@ from .helpers import os_open, flags_normal, flags_dir
 from .helpers import os_stat
 from .helpers import msgpack
 from .helpers import sig_int
-from .lrucache import LRUCache
+from .helpers.lrucache import LRUCache
 from .manifest import Manifest
 from .patterns import PathPrefixPattern, FnmatchPattern, IECommand
 from .item import Item, ArchiveItem, ItemDiff

+ 1 - 1
src/borg/fuse.py

@@ -41,8 +41,8 @@ from .hashindex import FuseVersionsIndex
 from .helpers import daemonize, daemonizing, signal_handler, format_file_size
 from .helpers import HardLinkManager
 from .helpers import msgpack
+from .helpers.lrucache import LRUCache
 from .item import Item
-from .lrucache import LRUCache
 from .platform import uid2user, gid2group
 from .remote import RemoteRepository
 

+ 0 - 0
src/borg/lrucache.py → src/borg/helpers/lrucache.py


+ 2 - 2
src/borg/repository.py

@@ -5,7 +5,7 @@ import shutil
 import stat
 import struct
 import time
-from binascii import hexlify, unhexlify
+from binascii import unhexlify
 from collections import defaultdict
 from configparser import ConfigParser
 from datetime import datetime, timezone
@@ -20,9 +20,9 @@ from .helpers import ProgressIndicatorPercent
 from .helpers import bin_to_hex
 from .helpers import secure_erase, safe_unlink
 from .helpers import msgpack
+from .helpers.lrucache import LRUCache
 from .locking import Lock, LockError, LockErrorT
 from .logger import create_logger
-from .lrucache import LRUCache
 from .manifest import Manifest
 from .platform import SaveFile, SyncFile, sync_dir, safe_fadvise
 from .checksums import crc32, StreamingXXH64

+ 1 - 1
src/borg/testsuite/lrucache.py

@@ -2,7 +2,7 @@ from tempfile import TemporaryFile
 
 import pytest
 
-from ..lrucache import LRUCache
+from ..helpers.lrucache import LRUCache
 
 
 class TestLRUCache: