Skip to content

bpo-40066: Enum: modify repr() and str() #22392

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 21 commits into from
Mar 31, 2021
Merged

bpo-40066: Enum: modify repr() and str() #22392

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
aa436ed
add new repr and str for converted Int-Enums/Flags
ethanfurman Sep 18, 2020
db0386f
wip
ethanfurman Sep 24, 2020
33cfa20
make Enum.__str__ print name or value
ethanfurman Sep 24, 2020
bdffc7d
add news entry
ethanfurman Sep 24, 2020
1bd8a6a
fix tests that checked Enum str()
ethanfurman Sep 24, 2020
dfe01a1
wip
ethanfurman Sep 24, 2020
2a5ace6
fix format for global string override
ethanfurman Sep 24, 2020
722474d
update docs with new stdlib enum reprs and strs
ethanfurman Sep 24, 2020
49a46d0
plain Enum has updated str() and repr()
ethanfurman Sep 25, 2020
e01379c
_stdlib_enum -> global_enum
ethanfurman Sep 25, 2020
893c636
fix pydoc and unicode tests
ethanfurman Sep 25, 2020
6ffaf77
fix white space
ethanfurman Sep 25, 2020
9f0ab8b
fix signal tests
ethanfurman Sep 25, 2020
d782de0
update NEWS entry
ethanfurman Sep 25, 2020
1013cea
use `.__dict__` instead of `vars()`
ethanfurman Sep 29, 2020
896b608
wip
ethanfurman Mar 13, 2021
4f43964
minor updates
ethanfurman Mar 25, 2021
40910ea
rewrite enum docs; add enum how-to
ethanfurman Mar 25, 2021
7643863
Enum: streamline repr() and str(); improve docs
ethanfurman Mar 26, 2021
2b3a5cc
add ``whatsnew`` entry
ethanfurman Mar 26, 2021
663e11a
Update 3.10.rst
ethanfurman Mar 31, 2021
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
Prev Previous commit
Next Next commit
use .__dict__ instead of vars()
  • Loading branch information
@ethanfurman
ethanfurman committed Mar 25, 2021
commit 1013ceacfc1396aa74f428add61d72d6f7b8f51c
6 changes: 3 additions & 3 deletions Lib/enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,9 +757,9 @@ def _convert_(cls, name, module, filter, source=None, boundary=None):
# module;
# also, replace the __reduce_ex__ method so unpickling works in
# previous Python versions
module_globals = vars(sys.modules[module])
module_globals = sys.modules[module].__dict__
if source:
source = vars(source)
source = source.__dict__
else:
source = module_globals
# _value2member_map_ is populated in the same order every time
Expand Down Expand Up @@ -1366,5 +1366,5 @@ def global_enum(cls):
cls.__repr__ = global_flag_repr
else:
cls.__repr__ = global_int_repr
vars(sys.modules[cls.__module__]).update(cls.__members__)
sys.modules[cls.__module__].__dict__.update(cls.__members__)
return cls