Skip to content

Fix filesystem path distribution name inference parsing. #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaraco merged 4 commits into from
May 21, 2022
Merged

Fix filesystem path distribution name inference parsing. #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b06c382
Removed shadowed variable and make _name_from_stem a staticmethod.
jaraco May 21, 2022
4461855
Add some (failing) tests for _name_from_stem. Ref #377
jaraco May 21, 2022
01843df
Fix issue when metadata on the file system has no version. No more eg…
jaraco May 21, 2022
9deee50
Update changelog. Ref #377.
jaraco May 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
=======

Expand Down
15 changes: 12 additions & 3 deletions importlib_metadata/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down