make mypy happy

Author: ThomasWaldmann

src/borg/fuse.py

@@ -9,9 +9,17 @@
 import time
 from collections import defaultdict, Counter
 from signal import SIGINT
+from typing import TYPE_CHECKING
 
 from .constants import ROBJ_FILE_STREAM, zeros
-from .fuse_impl import llfuse, has_pyfuse3, ENOATTR
+
+if TYPE_CHECKING:
+    # For type checking, assume llfuse is available
+    # This allows mypy to understand llfuse.Operations
+    import llfuse
+    from .fuse_impl import has_pyfuse3, ENOATTR
+else:
+    from .fuse_impl import llfuse, has_pyfuse3, ENOATTR
 
 
 if has_pyfuse3:

src/borg/fuse_impl.py

@@ -4,46 +4,50 @@
 
 import errno
 import os
+import types
 
 ENOATTR = getattr(errno, "ENOATTR", getattr(errno, "ENODATA", None))
 
 BORG_FUSE_IMPL = os.environ.get("BORG_FUSE_IMPL", "mfusepy,pyfuse3,llfuse")
 
+hlfuse: types.ModuleType | None = None
+llfuse: types.ModuleType | None = None
+
 for FUSE_IMPL in BORG_FUSE_IMPL.split(","):
     FUSE_IMPL = FUSE_IMPL.strip()
     if FUSE_IMPL == "pyfuse3":
         try:
-            import pyfuse3 as llfuse
+            import pyfuse3
         except ImportError:
             pass
         else:
+            llfuse = pyfuse3
             has_llfuse = False
             has_pyfuse3 = True
             has_mfusepy = False
             has_any_fuse = True
             ENOATTR = llfuse.ENOATTR
-            hlfuse = None  # noqa
             break
     elif FUSE_IMPL == "llfuse":
         try:
-            import llfuse
+            import llfuse as llfuse_module
         except ImportError:
             pass
         else:
+            llfuse = llfuse_module
             has_llfuse = True
             has_pyfuse3 = False
             has_mfusepy = False
             has_any_fuse = True
             ENOATTR = llfuse.ENOATTR
-            hlfuse = None  # noqa
             break
     elif FUSE_IMPL == "mfusepy":
         try:
-            import mfusepy as hlfuse
+            import mfusepy
         except ImportError:
             pass
         else:
-            llfuse = None  # noqa
+            hlfuse = mfusepy
             has_llfuse = False
             has_pyfuse3 = False
             has_mfusepy = True
@@ -55,8 +59,6 @@
     else:
         raise RuntimeError("Unknown FUSE implementation in BORG_FUSE_IMPL: '%s'." % BORG_FUSE_IMPL)
 else:
-    llfuse = None  # noqa
-    hlfuse = None  # noqa
     has_llfuse = False
     has_pyfuse3 = False
     has_mfusepy = False

src/borg/hlfuse.py

@@ -5,10 +5,16 @@
 import stat
 import time
 from collections import Counter
+from typing import TYPE_CHECKING
 
 from .constants import ROBJ_FILE_STREAM, zeros, ROBJ_DONTCARE
 
-from .fuse_impl import hlfuse
+if TYPE_CHECKING:
+    # For type checking, assume mfusepy is available
+    # This allows mypy to understand hlfuse.Operations
+    import mfusepy as hlfuse
+else:
+    from .fuse_impl import hlfuse
 
 from .logger import create_logger
 
@@ -28,7 +34,7 @@
 from .remote import RemoteRepository
 
 BLOCK_SIZE = 512  # Standard filesystem block size for st_blocks and statfs
-DEBUG_LOG = None  # os.path.join(os.getcwd(), "fuse_debug.log")
+DEBUG_LOG: str | None = None  # os.path.join(os.getcwd(), "fuse_debug.log")
 
 
 def debug_log(msg):