Merge pull request #379 from python/bugfix/egg-on-face

Fix filesystem path distribution name inference parsing.
python · May 21, 2022 · a92fbf3 · a92fbf3
2 parents c68e382 + 9deee50
commit a92fbf3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,9 @@
+v4.11.4
+=======
+
+* #377: In ``PathDistribution._name_from_stem``, avoid including
+  parts of the extension in the result.
+
 v4.11.3
 =======
 

diff --git a/importlib_metadata/__init__.py b/importlib_metadata/__init__.py
@@ -958,11 +958,20 @@ def _normalized_name(self):
         stem = os.path.basename(str(self._path))
         return self._name_from_stem(stem) or super()._normalized_name
 
-    def _name_from_stem(self, stem):
-        name, ext = os.path.splitext(stem)
+    @staticmethod
+    def _name_from_stem(stem):
+        """
+        >>> PathDistribution._name_from_stem('foo-3.0.egg-info')
+        'foo'
+        >>> PathDistribution._name_from_stem('CherryPy-3.0.dist-info')
+        'CherryPy'
+        >>> PathDistribution._name_from_stem('face.egg-info')
+        'face'
+        """
+        filename, ext = os.path.splitext(stem)
         if ext not in ('.dist-info', '.egg-info'):
             return
-        name, sep, rest = stem.partition('-')
+        name, sep, rest = filename.partition('-')
         return name