diff options
| author | Ethan Furman <ethan@stoneleaf.us> | 2022-01-16 06:41:43 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-16 06:41:43 (GMT) |
| commit | acf7403f9baea3ae1119fc6b4a3298522188bf96 (patch) | |
| tree | fcffbb83c601353ac1fce9b35b0f2424c8ce9899 /Lib/plistlib.py | |
| parent | 37eab55ac9da6b6361f136a1da15bfcef12ed954 (diff) | |
| download | cpython-acf7403f9baea3ae1119fc6b4a3298522188bf96.zip cpython-acf7403f9baea3ae1119fc6b4a3298522188bf96.tar.gz cpython-acf7403f9baea3ae1119fc6b4a3298522188bf96.tar.bz2 | |
bpo-40066: [Enum] update str() and format() output (GH-30582)
Undo rejected PEP-663 changes:
- restore `repr()` to its 3.10 status
- restore `str()` to its 3.10 status
New changes:
- `IntEnum` and `IntFlag` now leave `__str__` as the original `int.__str__` so that str() and format() return the same result
- zero-valued flags without a name have a slightly changed repr(), e.g. `repr(Color(0)) == '<Color: 0>'`
- update `dir()` for mixed-in types to return all the methods and attributes of the mixed-in type
- added `_numeric_repr_` to `Flag` to control display of unnamed values
- enums without doc strings have a more comprehensive doc string added
- `ReprEnum` added -- inheriting from this makes it so only `__repr__` is replaced, not `__str__` nor `__format__`; `IntEnum`, `IntFlag`, and `StrEnum` all inherit from `ReprEnum`
Diffstat (limited to 'Lib/plistlib.py')
| -rw-r--r-- | Lib/plistlib.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/plistlib.py b/Lib/plistlib.py index 3ab71ed..4862355 100644 --- a/Lib/plistlib.py +++ b/Lib/plistlib.py @@ -61,7 +61,8 @@ import struct from xml.parsers.expat import ParserCreate -PlistFormat = enum.global_enum(enum.Enum('PlistFormat', 'FMT_XML FMT_BINARY', module=__name__)) +PlistFormat = enum.Enum('PlistFormat', 'FMT_XML FMT_BINARY', module=__name__) +globals().update(PlistFormat.__members__) class UID: |