summaryrefslogtreecommitdiff
path: root/qutebrowser/utils/utils.py
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2021-07-12 16:03:41 +0200
committerFlorian Bruhin <me@the-compiler.org>2021-07-28 14:08:16 +0200
commit1f663fc8a1652b6cb3f9c5947ee368357929446a (patch)
treee22f519c099280d026b1ca0cf302ecb0c925c553 /qutebrowser/utils/utils.py
parentc36970521fe5ec84f8bdef6cfd0a8bf89bb4fabb (diff)
downloadqutebrowser-1f663fc8a1652b6cb3f9c5947ee368357929446a.tar.gz
qutebrowser-1f663fc8a1652b6cb3f9c5947ee368357929446a.zip
Revert "Fix enum stringification for Python 3.10 a7+"
This reverts commit e2c5fe6262564d9d85806bfa9d4486a411cf5045. See https://mail.python.org/archives/list/python-dev@python.org/thread/ZMC67QA2JVQJSWSFWRS6IM6ZX4EK277G/#LSTMFAPSPD3BGZ4D6HQFODXZVB3PLYKF (cherry picked from commit 204721836133485efb1acba6d2795193788f9eda)
Diffstat (limited to 'qutebrowser/utils/utils.py')
-rw-r--r--qutebrowser/utils/utils.py20
1 files changed, 1 insertions, 19 deletions
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index fb0165de2..a56769255 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -375,18 +375,6 @@ def is_enum(obj: Any) -> bool:
return False
-def pyenum_str(value: enum.Enum) -> str:
- """Get a string representation of a Python enum value.
-
- This will have the form of "EnumType.membername", which is the default string
- representation for Python up to 3.10. Unfortunately, that changes with Python 3.10:
- https://bugs.python.org/issue40066
- """
- if sys.version_info[:2] >= (3, 10):
- return repr(value)
- return str(value)
-
-
def get_repr(obj: Any, constructor: bool = False, **attrs: Any) -> str:
"""Get a suitable __repr__ string for an object.
@@ -399,14 +387,8 @@ def get_repr(obj: Any, constructor: bool = False, **attrs: Any) -> str:
cls = qualname(obj.__class__)
parts = []
items = sorted(attrs.items())
-
for name, val in items:
- if isinstance(val, enum.Enum):
- s = pyenum_str(val)
- else:
- s = repr(val)
- parts.append(f'{name}={s}')
-
+ parts.append('{}={!r}'.format(name, val))
if constructor:
return '{}({})'.format(cls, ', '.join(parts))
else: