[3.12] gh-114149: [Enum] revert GH-114196 and add more tuple-subclass tests (GH-114215) (GH-114218)

gh-114149: [Enum] revert GH-114160 and add more tuple-subclass tests (GH-114215)

This reverts commit 05e142b154.
(cherry picked from commit 4c7e09d012)

Co-authored-by: Ethan Furman <ethan@stoneleaf.us>
This commit is contained in:
Miss Islington (bot) 2024-01-18 05:36:28 +01:00 committed by GitHub
parent 87198f6c23
commit 35e330ba85
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 24 additions and 9 deletions

View file

@ -254,7 +254,7 @@ class _proto_member:
delattr(enum_class, member_name)
# second step: create member based on enum_class
value = self.value
if type(value) is not tuple:
if not isinstance(value, tuple):
args = (value, )
else:
args = value
@ -1757,7 +1757,7 @@ def _simple_enum(etype=Enum, *, boundary=None, use_args=None):
else:
# create the member
if use_args:
if type(value) is not tuple:
if not isinstance(value, tuple):
value = (value, )
member = new_member(enum_class, *value)
value = value[0]
@ -1807,7 +1807,7 @@ def _simple_enum(etype=Enum, *, boundary=None, use_args=None):
else:
# create the member
if use_args:
if type(value) is not tuple:
if not isinstance(value, tuple):
value = (value, )
member = new_member(enum_class, *value)
value = value[0]