Fix type errors

Author: WangGithubUser

client/configuration/exceptions.py

@@ -18,3 +18,8 @@ def __init__(self, message: str) -> None:
 class InvalidPythonVersion(InvalidConfiguration):
     def __init__(self, message: str) -> None:
         super().__init__(message)
+
+
+class InvalidPackage(ValueError):
+    def __init__(self, pkg_name: str) -> None:
+        super().__init__(f"Invalid package: {pkg_name} does not exist.")

client/configuration/search_path.py

@@ -28,9 +28,9 @@
 LOG: logging.Logger = logging.getLogger(__name__)
 
 dist_info_in_root: Dict[str, List[str]] = {}
-_site_filter = re.compile(r".*-([0-99]\.)*dist-info")
+_site_filter: re.Pattern[str] = re.compile(r".*-([0-99]\.)*dist-info")
 
-_PYCACHE = re.compile("__pycache__")
+_PYCACHE: re.Pattern[str] = re.compile("__pycache__")
 
 
 def _expand_relative_root(path: str, relative_root: str) -> str:
@@ -78,7 +78,7 @@ class SitePackageElement(Element):
     package_name: str
     is_toplevel_module: bool = False
 
-    def package_path(self) -> Union[str, None]:
+    def package_path(self) -> str:
         if not self.is_toplevel_module:
             return self.package_name
 
@@ -97,10 +97,14 @@ def package_path(self) -> Union[str, None]:
                 dist_info_path = f"{self.site_root}/{directory}"
                 break
         else:
-            return None
+            raise exceptions.InvalidPackage(self.package_name)
 
-        not_toplevel_patterns: Tuple[re.Pattern] = (this_pkg_filter, _PYCACHE)
+        not_toplevel_patterns: Tuple[re.Pattern[str], re.Pattern[str]] = (
+            this_pkg_filter,
+            _PYCACHE,
+        )
 
+        # pyre-fixme[61]: Local variable `dist_info_path` is undefined, or not always defined.
         with open(file=f"{dist_info_path}/RECORD", mode="r") as record:
             files = []
             for val in [line.split(",") for line in record.readlines()]:
@@ -114,7 +118,7 @@ def package_path(self) -> Union[str, None]:
                 else:
                     return file
 
-        return None
+        raise exceptions.InvalidPackage(self.package_name)
 
     def path(self) -> str:
         return os.path.join(self.site_root, self.package_path())

client/configuration/tests/search_path_test.py

@@ -250,7 +250,7 @@ def test_process_required_raw_elements_site_package_nonexistence(self) -> None:
                 required=True,
             )
 
-    def test_toplevel_module_not_pyfile(self):
+    def test_toplevel_module_not_pyfile(self) -> None:
         Path.mkdir(Path("foo"), exist_ok=True)
         Path.mkdir(Path("foo/bar-1.0.0.dist-info"), exist_ok=True)
         Path.touch(Path("foo/bar.so"), exist_ok=True)