Merge pull request #115 from r1chardj0n3s/remove-dict-handling

Remove handling of now-unsupported pip versions

Author: adamtheturtle

pip_check_reqs/find_extra_reqs.py

@@ -44,26 +44,21 @@ def find_extra_reqs(
     ]
 
     for package in search_packages_info(all_pkgs):
-        if isinstance(package, dict):  # pragma: no cover
-            package_name = package["name"]
-            package_location = package["location"]
-            package_files = package.get("files", []) or []
-        else:  # pragma: no cover
-            package_name = package.name
-            package_location = package.location
-            package_files = []
-            for item in package.files or []:
-                here = pathlib.Path(".").resolve()
-                item_location_rel = pathlib.Path(package_location) / item
-                item_location = item_location_rel.resolve()
-                try:
-                    relative_item_location = item_location.relative_to(here)
-                except ValueError:
-                    # Ideally we would use Pathlib.is_relative_to rather than
-                    # checking for a ValueError, but that is only available in
-                    # Python 3.9+.
-                    relative_item_location = item_location
-                package_files.append(str(relative_item_location))
+        package_name = package.name
+        package_location = package.location
+        package_files = []
+        for item in package.files or []:
+            here = pathlib.Path(".").resolve()
+            item_location_rel = pathlib.Path(package_location) / item
+            item_location = item_location_rel.resolve()
+            try:
+                relative_item_location = item_location.relative_to(here)
+            except ValueError:
+                # Ideally we would use Pathlib.is_relative_to rather than
+                # checking for a ValueError, but that is only available in
+                # Python 3.9+.
+                relative_item_location = item_location
+            package_files.append(str(relative_item_location))
 
         log.debug(
             "installed package: %s (at %s)", package_name, package_location

pip_check_reqs/find_missing_reqs.py

@@ -42,26 +42,21 @@ def find_missing_reqs(
     ]
 
     for package in search_packages_info(all_pkgs):
-        if isinstance(package, dict):  # pragma: no cover
-            package_name = package["name"]
-            package_location = package["location"]
-            package_files = package.get("files", []) or []
-        else:  # pragma: no cover
-            package_name = package.name
-            package_location = package.location
-            package_files = []
-            for item in package.files or []:
-                here = pathlib.Path(".").resolve()
-                item_location_rel = pathlib.Path(package_location) / item
-                item_location = item_location_rel.resolve()
-                try:
-                    relative_item_location = item_location.relative_to(here)
-                except ValueError:
-                    # Ideally we would use Pathlib.is_relative_to rather than
-                    # checking for a ValueError, but that is only available in
-                    # Python 3.9+.
-                    relative_item_location = item_location
-                package_files.append(str(relative_item_location))
+        package_name = package.name
+        package_location = package.location
+        package_files = []
+        for item in package.files or []:
+            here = pathlib.Path(".").resolve()
+            item_location_rel = pathlib.Path(package_location) / item
+            item_location = item_location_rel.resolve()
+            try:
+                relative_item_location = item_location.relative_to(here)
+            except ValueError:
+                # Ideally we would use Pathlib.is_relative_to rather than
+                # checking for a ValueError, but that is only available in
+                # Python 3.9+.
+                relative_item_location = item_location
+            package_files.append(str(relative_item_location))
 
         log.debug(
             "installed package: %s (at %s)", package_name, package_location