FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-45417: fix quadratic behaviour when creating an enum by cfbolz · Pull Request #28907 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

bpo-45417: fix quadratic behaviour when creating an enum #28907

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
ethanfurman merged 3 commits into from
Oct 14, 2021
Conversation 8 Commits 3 Checks 0 Files changed
Merged

bpo-45417: fix quadratic behaviour when creating an enum #28907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d721bbd
bpo-45417: fix quadratic behaviour in the enum module
cfbolz Oct 12, 2021
98aae2d
add news
cfbolz Oct 12, 2021
f5771be
fix typo
cfbolz Oct 12, 2021
File filter

Filter by extension

Filter by extension .py  (1) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
21 changes: 14 additions & 7 deletions Lib/enum.py
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,18 @@ def __set_name__(self, enum_class, member_name):
enum_member._sort_order_ = len(enum_class._member_names_)
# If another member with the same value was already defined, the
# new member becomes an alias to the existing one.
for name, canonical_member in enum_class._member_map_.items():
if canonical_member._value_ == enum_member._value_:
enum_member = canonical_member
break
else:
try:
try:
# try to do a fast lookup to avoid the quadratic loop
enum_member = enum_class._value2member_map_[value]
Comment thread
cfbolz marked this conversation as resolved.
except TypeError:
for name, canonical_member in enum_class._member_map_.items():
if canonical_member._value_ == value:
enum_member = canonical_member
break
else:
raise KeyError
except KeyError:
# this could still be an alias if the value is multi-bit and the
# class is a flag class
if (
Expand Down Expand Up @@ -301,7 +308,7 @@ class _EnumDict(dict):
"""
def __init__(self):
super().__init__()
self._member_names = []
self._member_names = {} # use a dict to keep insertion order
self._last_values = []
self._ignore = []
self._auto_called = False
Expand Down Expand Up @@ -365,7 +372,7 @@ def __setitem__(self, key, value):
)
self._auto_called = True
value = value.value
self._member_names.append(key)
self._member_names[key] = None
self._last_values.append(value)
super().__setitem__(key, value)

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2021-10-12-20-35-06.bpo-45417.gQM-O7.rst
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix quadratic behaviour in the enum module: Creation of enum classes with a
lot of entries was quadratic.
Back | FazBrowse Home | New Git URL