From 578639b35e980ced0b12cc7f63b59a352eda97b5 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 13 Aug 2022 22:02:04 +0200 Subject: [PATCH] move lrucache module to borg.helpers --- src/borg/archive.py | 4 ++-- src/borg/fuse.py | 2 +- src/borg/{ => helpers}/lrucache.py | 0 src/borg/repository.py | 4 ++-- src/borg/testsuite/lrucache.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename src/borg/{ => helpers}/lrucache.py (100%) diff --git a/src/borg/archive.py b/src/borg/archive.py index ab16ac83c..acbbdd31c 100644 --- a/src/borg/archive.py +++ b/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 diff --git a/src/borg/fuse.py b/src/borg/fuse.py index 09ebd5bc4..9f5bf2298 100644 --- a/src/borg/fuse.py +++ b/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 diff --git a/src/borg/lrucache.py b/src/borg/helpers/lrucache.py similarity index 100% rename from src/borg/lrucache.py rename to src/borg/helpers/lrucache.py diff --git a/src/borg/repository.py b/src/borg/repository.py index 838d349cb..1cb18a63e 100644 --- a/src/borg/repository.py +++ b/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 diff --git a/src/borg/testsuite/lrucache.py b/src/borg/testsuite/lrucache.py index 79bb734c4..6b0d661e3 100644 --- a/src/borg/testsuite/lrucache.py +++ b/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: