Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 2 additions & 11 deletions Lib/importlib/metadata/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -890,14 +890,6 @@ def search(self, prepared: Prepared):
return itertools.chain(infos, eggs)


# Translation table for Prepared.normalize: lowercase and
# replace "-" (hyphen) and "." (dot) with "_" (underscore).
_normalize_table = str.maketrans(
"ABCDEFGHIJKLMNOPQRSTUVWXYZ-.",
"abcdefghijklmnopqrstuvwxyz__",
)


class Prepared:
"""
A prepared search query for metadata on a possibly-named package.
Expand Down Expand Up @@ -933,9 +925,8 @@ def normalize(name):
"""
PEP 503 normalization plus dashes as underscores.
"""
# Emulates ``re.sub(r"[-_.]+", "-", name).lower()`` from PEP 503
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change removes this important note that links the PEP 503 prescription from the actual implementation.

# About 3x faster, safe since packages only support alphanumeric characters
value = name.translate(_normalize_table)
# Much faster than re.sub, and even faster than str.translate
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment is now out of place. It's commenting on historical content.

value = name.lower().replace("-", "_").replace(".", "_")
# Condense repeats (faster than regex)
while "__" in value:
value = value.replace("__", "_")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
:mod:`importlib.metadata`: Use :meth:`str.lower` and :meth:`str.replace` to
further improve performance of
:meth:`!importlib.metadata.Prepared.normalize`. Patch by Hugo van Kemenade
and Henry Schreiner.
Loading