From 4de6e41b5634ccd8f0ca80394114ed15746d4c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Walter=20D=C3=B6rwald?= Date: Thu, 18 Jul 2019 20:37:13 +0200 Subject: [PATCH] bpo-34443: Use __qualname__ instead of __name__ in enum exception messages. (GH-14809) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Use __qualname__ instead of __name__ in enum exception messages. (cherry picked from commit 323842c2792a81e87917790506ec3457832c84b3) Co-authored-by: Walter Dörwald --- Lib/enum.py | 8 ++++---- Lib/test/test_enum.py | 13 +++++++------ .../2019-07-17-11-10-08.bpo-34443.OFnGqz.rst | 2 ++ 3 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2019-07-17-11-10-08.bpo-34443.OFnGqz.rst diff --git a/Lib/enum.py b/Lib/enum.py index d0b03b4aa56ce4..f2383229b5cae4 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -552,7 +552,7 @@ def __new__(cls, value): if isinstance(result, cls): return result 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: raise ve_exc elif exc is None: @@ -574,7 +574,7 @@ def _generate_next_value_(name, start, count, last_values): @classmethod 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): return "<%s.%s: %r>" % ( @@ -716,7 +716,7 @@ def _create_pseudo_member_(cls, value): # verify all bits are accounted for _, extra_flags = _decompose(cls, value) 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 pseudo_member = object.__new__(cls) pseudo_member._name_ = None @@ -793,7 +793,7 @@ class IntFlag(int, Flag): @classmethod def _missing_(cls, value): 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) return new_member diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index 29a429ccd998f2..8d0222326bff11 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -2217,12 +2217,13 @@ class Bizarre(Flag): d = 4 f = 6 # Bizarre.c | Bizarre.d - self.assertRaisesRegex(ValueError, "5 is not a valid Bizarre", Bizarre, 5) - self.assertRaisesRegex(ValueError, "5 is not a valid Bizarre", Bizarre, 5) - self.assertRaisesRegex(ValueError, "2 is not a valid Bizarre", Bizarre, 2) - self.assertRaisesRegex(ValueError, "2 is not a valid Bizarre", Bizarre, 2) - self.assertRaisesRegex(ValueError, "1 is not a valid Bizarre", Bizarre, 1) - self.assertRaisesRegex(ValueError, "1 is not a valid Bizarre", Bizarre, 1) + name = "TestFlag.test_cascading_failure..Bizarre" + self.assertRaisesRegex(ValueError, "5 is not a valid " + name, Bizarre, 5) + self.assertRaisesRegex(ValueError, "5 is not a valid " + name, Bizarre, 5) + self.assertRaisesRegex(ValueError, "2 is not a valid " + name, Bizarre, 2) + self.assertRaisesRegex(ValueError, "2 is not a valid " + name, Bizarre, 2) + 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): class Dupes(Enum): diff --git a/Misc/NEWS.d/next/Library/2019-07-17-11-10-08.bpo-34443.OFnGqz.rst b/Misc/NEWS.d/next/Library/2019-07-17-11-10-08.bpo-34443.OFnGqz.rst new file mode 100644 index 00000000000000..8987a792b59c4c --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-07-17-11-10-08.bpo-34443.OFnGqz.rst @@ -0,0 +1,2 @@ +Exceptions from :mod:`enum` now use the ``__qualname`` of the enum class in +the exception message instead of the ``__name__``.