Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
e57f91a0
Commit
e57f91a0
authored
Jun 19, 2018
by
INADA Naoki
Committed by
GitHub
Jun 19, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-33866: enum: Stop using OrderedDict (GH-7698)
parent
ea3dc802
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
15 deletions
+7
-15
Doc/library/enum.rst
Doc/library/enum.rst
+2
-2
Lib/enum.py
Lib/enum.py
+5
-13
No files found.
Doc/library/enum.rst
View file @
e57f91a0
...
...
@@ -281,7 +281,7 @@ Iterating over the members of an enum does not provide the aliases::
>>> list(Shape)
[<Shape.SQUARE: 2>, <Shape.DIAMOND: 1>, <Shape.CIRCLE: 3>]
The special attribute ``__members__`` is a
n ordered dictionary mapping
names
The special attribute ``__members__`` is a
read-only ordered mapping of
names
to members. It includes all names defined in the enumeration, including the
aliases::
...
...
@@ -998,7 +998,7 @@ Finer Points
Supported ``__dunder__`` names
""""""""""""""""""""""""""""""
:attr:`__members__` is a
n :class:`OrderedDict`
of ``member_name``:``member``
:attr:`__members__` is a
read-only ordered mapping
of ``member_name``:``member``
items. It is only available on the class.
:meth:`__new__`, if specified, must create and return the enum members; it is
...
...
Lib/enum.py
View file @
e57f91a0
import
sys
from
types
import
MappingProxyType
,
DynamicClassAttribute
# try _collections first to reduce startup cost
try
:
from
_collections
import
OrderedDict
except
ImportError
:
from
collections
import
OrderedDict
__all__
=
[
'EnumMeta'
,
...
...
@@ -168,7 +162,7 @@ class EnumMeta(type):
# create our new Enum type
enum_class
=
super
().
__new__
(
metacls
,
cls
,
bases
,
classdict
)
enum_class
.
_member_names_
=
[]
# names in definition order
enum_class
.
_member_map_
=
OrderedDict
()
# name->value map
enum_class
.
_member_map_
=
{}
# name->value map
enum_class
.
_member_type_
=
member_type
# save attributes from super classes so we know if we can take
...
...
@@ -630,14 +624,12 @@ class Enum(metaclass=EnumMeta):
source
=
vars
(
source
)
else
:
source
=
module_globals
# We use an OrderedDict of sorted source keys so that the
# _value2member_map is populated in the same order every time
# _value2member_map_ is populated in the same order every time
# for a consistent reverse mapping of number to name when there
# are multiple names for the same number rather than varying
# between runs due to hash randomization of the module dictionary.
# are multiple names for the same number.
members
=
[
(
name
,
source
[
name
]
)
for
name
in
source
.
key
s
()
(
name
,
value
)
for
name
,
value
in
source
.
item
s
()
if
filter
(
name
)]
try
:
# sort by value
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment