mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #7029 from ThomasWaldmann/relative-imports 

Relative imports
This commit is contained in:
TW 2022-09-16 20:48:32 +02:00 committed by GitHub
parent f5df35b36e 785cb4c21a
commit 16787e48b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/borg/__main__.py
View File

@ -11,6 +11,6 @@ if sys.platform.startswith("win32"):
os.environ["PATH"] = os.pathsep.join(dll_path) + os.pathsep + os.environ["PATH"]
from borg.archiver import main
from .archiver import main
main()

7
src/borg/testsuite/archiver/mount_cmds.py
View File

@ -6,10 +6,9 @@ import unittest
import pytest
import borg
import borg.helpers.errors
from ... import xattr, platform
from ...constants import * # NOQA
from ...locking import Lock
from ...helpers import flags_noatime, flags_normal
from .. import has_lchflags, llfuse
from .. import changedir, no_selinux
@ -301,7 +300,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
return wrapper
# Decorate
borg.locking.Lock.migrate_lock = write_assert_data(borg.locking.Lock.migrate_lock)
Lock.migrate_lock = write_assert_data(Lock.migrate_lock)
try:
self.cmd(f"--repo={self.repository_location}", "rcreate", "--encryption=none")
self.create_src_archive("arch")
@ -347,7 +346,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
], "new_id must be alive (=must not be stale) when Lock.migrate_lock() has returned."
finally:
# Undecorate
borg.locking.Lock.migrate_lock = borg.locking.Lock.migrate_lock.__wrapped__
Lock.migrate_lock = Lock.migrate_lock.__wrapped__
class RemoteArchiverTestCase(RemoteArchiverTestCaseBase, ArchiverTestCase):