-
-
Notifications
You must be signed in to change notification settings - Fork 34.3k
gh-143658: Use str.lower and replace to further improve performance of importlib.metadata.Prepared.normalized
#144083
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.
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
+6
−11
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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. | ||
|
|
@@ -933,9 +925,8 @@ def normalize(name): | |
| """ | ||
| PEP 503 normalization plus dashes as underscores. | ||
| """ | ||
| # Emulates ``re.sub(r"[-_.]+", "-", name).lower()`` from PEP 503 | ||
| # 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 | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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("__", "_") | ||
|
|
||
4 changes: 4 additions & 0 deletions
4
Misc/NEWS.d/next/Library/2026-01-20-20-54-46.gh-issue-143658.v8i1jE.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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. |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.