Fix pyright with thread local and unused import

gauge-sh · Feb 10, 2024 · 8a81f3c · 8a81f3c
1 parent 6b660f1
commit 8a81f3c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/modguard/filesystem/service.py b/modguard/filesystem/service.py
@@ -17,7 +17,10 @@ class FileInfo:
 
 # Thread-local file cache to avoid going to disk as much as possible
 thread_local = threading.local()
+# Cannot type-hint non-self attributes (https://github.com/python/mypy/issues/2388)
+# cwd: str
 thread_local.cwd = os.getcwd()
+# file_caches_by_cwd: defaultdict[str, dict[str, FileInfo]]
 thread_local.file_caches_by_cwd = defaultdict(dict)
 
 
@@ -38,7 +41,9 @@ def _get_file_cache() -> dict[str, FileInfo]:
     if not hasattr(thread_local, "file_caches_by_cwd"):
         print("reset file cache")
         thread_local.file_caches_by_cwd = defaultdict(dict)
-    file_caches_by_cwd = thread_local.file_caches_by_cwd
+    file_caches_by_cwd: defaultdict[
+        str, dict[str, FileInfo]
+    ] = thread_local.file_caches_by_cwd  # type: ignore
     return file_caches_by_cwd[get_cwd()]
 
 

diff --git a/modguard/parsing/imports.py b/modguard/parsing/imports.py
@@ -5,7 +5,6 @@
 
 from modguard import filesystem as fs
 from modguard.public import public
-from modguard.errors import ModguardParseError
 
 
 @dataclass