bpo-41789: honor object overrides in Enum classes (GH-22250)

EnumMeta double-checks that `__repr__`, `__str__`, `__format__`, and `__reduce_ex__` are not the same as `object`'s, and replaces them if they are -- even if that replacement was intentionally done in the Enum being constructed.  This patch fixes that.

Automerge-Triggered-By: @ethanfurman
This commit is contained in:
Ethan Furman 2020-09-15 16:28:25 -07:00 committed by GitHub
parent 47f6ec4c09
commit 22415ad625
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions

View File

@ -250,7 +250,11 @@ class EnumMeta(type):
# double check that repr and friends are not the mixin's or various # double check that repr and friends are not the mixin's or various
# things break (such as pickle) # things break (such as pickle)
# however, if the method is defined in the Enum itself, don't replace
# it
for name in ('__repr__', '__str__', '__format__', '__reduce_ex__'): for name in ('__repr__', '__str__', '__format__', '__reduce_ex__'):
if name in classdict:
continue
class_method = getattr(enum_class, name) class_method = getattr(enum_class, name)
obj_method = getattr(member_type, name, None) obj_method = getattr(member_type, name, None)
enum_method = getattr(first_enum, name, None) enum_method = getattr(first_enum, name, None)

View File

@ -560,6 +560,14 @@ class TestEnum(unittest.TestCase):
self.assertFormatIsValue('{:>20}', Directional.WEST) self.assertFormatIsValue('{:>20}', Directional.WEST)
self.assertFormatIsValue('{:<20}', Directional.WEST) self.assertFormatIsValue('{:<20}', Directional.WEST)
def test_object_str_override(self):
class Colors(Enum):
RED, GREEN, BLUE = 1, 2, 3
def __repr__(self):
return "test.%s" % (self._name_, )
__str__ = object.__str__
self.assertEqual(str(Colors.RED), 'test.RED')
def test_enum_str_override(self): def test_enum_str_override(self):
class MyStrEnum(Enum): class MyStrEnum(Enum):
def __str__(self): def __str__(self):
@ -602,7 +610,6 @@ class TestEnum(unittest.TestCase):
class Huh(MyStr, MyInt, Enum): class Huh(MyStr, MyInt, Enum):
One = 1 One = 1
def test_hash(self): def test_hash(self):
Season = self.Season Season = self.Season
dates = {} dates = {}

View File

@ -0,0 +1,2 @@
Honor `object` overrides in `Enum` class creation (specifically, `__str__`,
`__repr__`, `__format__`, and `__reduce_ex__`).