Merge pull request #454 from python/bugfix/103661

Fix path handling and masked errors on Windows for installed-files.txt
python · Apr 22, 2023 · af84998 · af84998
2 parents 11b9ddf + be58651
commit af84998
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,10 @@
+v6.5.1
+======
+
+* python/cpython#103661: Removed excess error suppression in
+  ``_read_files_egginfo_installed`` and fixed path handling
+  on Windows.
+
 v6.5.0
 ======
 

diff --git a/importlib_metadata/__init__.py b/importlib_metadata/__init__.py
@@ -536,12 +536,15 @@ def _read_files_egginfo_installed(self):
         subdir = getattr(self, '_path', None)
         if not text or not subdir:
             return
-        with contextlib.suppress(Exception):
-            ret = [
-                str((subdir / line).resolve().relative_to(self.locate_file('')))
-                for line in text.splitlines()
-            ]
-            return map('"{}"'.format, ret)
+
+        ret = [
+            (subdir / line)
+            .resolve()
+            .relative_to(self.locate_file('').resolve())
+            .as_posix()
+            for line in text.splitlines()
+        ]
+        return map('"{}"'.format, ret)
 
     def _read_files_egginfo_sources(self):
         """