mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-28 03:13:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-34443: Use __qualname__ instead of __name__ in enum exception messages. (GH-14809)

Browse source 
* Use __qualname__ instead of __name__ in enum exception messages.
This commit is contained in:
Walter Dörwald 2019-07-18 20:37:13 +02:00 • committed by Ethan Furman
parent af2f5b1723
commit 323842c279
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/enum.py
View file

@ -577,7 +577,7 @@ class Enum(metaclass=EnumMeta):
if isinstance(result, cls): if isinstance(result, cls):
return result return result
else: else:
ve_exc = ValueError("%r is not a valid %s" % (value, cls.__name__)) ve_exc = ValueError("%r is not a valid %s" % (value, cls.__qualname__))
if result is None and exc is None: if result is None and exc is None:
raise ve_exc raise ve_exc
elif exc is None: elif exc is None:
@ -599,7 +599,7 @@ class Enum(metaclass=EnumMeta):
@classmethod @classmethod
def _missing_(cls, value): def _missing_(cls, value):
raise ValueError("%r is not a valid %s" % (value, cls.__name__)) raise ValueError("%r is not a valid %s" % (value, cls.__qualname__))
def __repr__(self): def __repr__(self):
return "<%s.%s: %r>" % ( return "<%s.%s: %r>" % (
@ -706,7 +706,7 @@ class Flag(Enum):
# verify all bits are accounted for # verify all bits are accounted for
_, extra_flags = _decompose(cls, value) _, extra_flags = _decompose(cls, value)
if extra_flags: if extra_flags:
raise ValueError("%r is not a valid %s" % (value, cls.__name__)) raise ValueError("%r is not a valid %s" % (value, cls.__qualname__))
# construct a singleton enum pseudo-member # construct a singleton enum pseudo-member
pseudo_member = object.__new__(cls) pseudo_member = object.__new__(cls)
pseudo_member._name_ = None pseudo_member._name_ = None
@ -780,7 +780,7 @@ class IntFlag(int, Flag):
@classmethod @classmethod
def _missing_(cls, value): def _missing_(cls, value):
if not isinstance(value, int): if not isinstance(value, int):
raise ValueError("%r is not a valid %s" % (value, cls.__name__)) raise ValueError("%r is not a valid %s" % (value, cls.__qualname__))
new_member = cls._create_pseudo_member_(value) new_member = cls._create_pseudo_member_(value)
return new_member return new_member

13
Lib/test/test_enum.py
View file

@ -2260,12 +2260,13 @@ class TestFlag(unittest.TestCase):
d = 4 d = 4
f = 6 f = 6
# Bizarre.c | Bizarre.d # Bizarre.c | Bizarre.d
self.assertRaisesRegex(ValueError, "5 is not a valid Bizarre", Bizarre, 5) name = "TestFlag.test_cascading_failure.<locals>.Bizarre"
self.assertRaisesRegex(ValueError, "5 is not a valid Bizarre", Bizarre, 5) self.assertRaisesRegex(ValueError, "5 is not a valid " + name, Bizarre, 5)
self.assertRaisesRegex(ValueError, "2 is not a valid Bizarre", Bizarre, 2) self.assertRaisesRegex(ValueError, "5 is not a valid " + name, Bizarre, 5)
self.assertRaisesRegex(ValueError, "2 is not a valid Bizarre", Bizarre, 2) self.assertRaisesRegex(ValueError, "2 is not a valid " + name, Bizarre, 2)
self.assertRaisesRegex(ValueError, "1 is not a valid Bizarre", Bizarre, 1) self.assertRaisesRegex(ValueError, "2 is not a valid " + name, Bizarre, 2)
self.assertRaisesRegex(ValueError, "1 is not a valid Bizarre", Bizarre, 1) self.assertRaisesRegex(ValueError, "1 is not a valid " + name, Bizarre, 1)
self.assertRaisesRegex(ValueError, "1 is not a valid " + name, Bizarre, 1)
def test_duplicate_auto(self): def test_duplicate_auto(self):
class Dupes(Enum): class Dupes(Enum):

2
Misc/NEWS.d/next/Library/2019-07-17-11-10-08.bpo-34443.OFnGqz.rst Normal file
View file

@ -0,0 +1,2 @@
Exceptions from :mod:`enum` now use the ``__qualname`` of the enum class in
the exception message instead of the ``__name__``.