p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[3.2.x] Refs #32074 -- Fixed TextChoices/IntegerChoices crash on Python 3.10. 

EnumMeta has a new keyword argument 'boundary' in Python 3.10. This
is a new mechanism that controls how out-of-range / invalid bits are
handled, see https://bugs.python.org/issue38250.

Backport of 5d9b065d3f from master
This commit is contained in:
Mariusz Felisiak 2021-02-03 16:00:04 +01:00 committed by Carlton Gibson
parent cb680b6819
commit ff25791d23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/models/enums.py
View File

@ -8,7 +8,7 @@ __all__ = ['Choices', 'IntegerChoices', 'TextChoices']
class ChoicesMeta(enum.EnumMeta): class ChoicesMeta(enum.EnumMeta):
"""A metaclass for creating a enum choices.""" """A metaclass for creating a enum choices."""
def __new__(metacls, classname, bases, classdict): def __new__(metacls, classname, bases, classdict, **kwds):
labels = [] labels = []
for key in classdict._member_names: for key in classdict._member_names:
value = classdict[key] value = classdict[key]
@ -25,7 +25,7 @@ class ChoicesMeta(enum.EnumMeta):
# Use dict.__setitem__() to suppress defenses against double # Use dict.__setitem__() to suppress defenses against double
# assignment in enum's classdict. # assignment in enum's classdict.
dict.__setitem__(classdict, key, value) dict.__setitem__(classdict, key, value)
cls = super().__new__(metacls, classname, bases, classdict) cls = super().__new__(metacls, classname, bases, classdict, **kwds)
cls._value2label_map_ = dict(zip(cls._value2member_map_, labels)) cls._value2label_map_ = dict(zip(cls._value2member_map_, labels))
# Add a label property to instances of enum which uses the enum member # Add a label property to instances of enum which uses the enum member
# that is passed in as "self" as the value to use when looking up the # that is passed in as "self" as the value to use when looking up the