From f348c86f0837aa2c4090bd128c44b5cfd42a9990 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Fri, 16 Sep 2022 19:09:12 +0200
Subject: [PATCH 1/2] mount cmd tests: remove absolute "borg" import

---
 src/borg/testsuite/archiver/mount_cmds.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/borg/testsuite/archiver/mount_cmds.py b/src/borg/testsuite/archiver/mount_cmds.py
index 8a1f051af..f7559ad31 100644
--- a/src/borg/testsuite/archiver/mount_cmds.py
+++ b/src/borg/testsuite/archiver/mount_cmds.py
@@ -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):

From 785cb4c21a1b63631a690a4c6b70fb7240094bba Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Fri, 16 Sep 2022 19:37:54 +0200
Subject: [PATCH 2/2] __main__: remove absolute "borg" import

---
 src/borg/__main__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/borg/__main__.py b/src/borg/__main__.py
index a1dbbdc34..16279fc8d 100644
--- a/src/borg/__main__.py
+++ b/src/borg/__main__.py
@@ -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()