-
-
Notifications
You must be signed in to change notification settings - Fork 6.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix choices in ChoiceField to support IntEnum #8955
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,7 @@ | |
import re | ||
import uuid | ||
from collections.abc import Mapping | ||
from enum import Enum | ||
|
||
from django.conf import settings | ||
from django.core.exceptions import ObjectDoesNotExist | ||
|
@@ -17,7 +18,6 @@ | |
MinValueValidator, ProhibitNullCharactersValidator, RegexValidator, | ||
URLValidator, ip_address_validators | ||
) | ||
from django.db.models import IntegerChoices, TextChoices | ||
from django.forms import FilePathField as DjangoFilePathField | ||
from django.forms import ImageField as DjangoImageField | ||
from django.utils import timezone | ||
|
@@ -1401,11 +1401,8 @@ def __init__(self, choices, **kwargs): | |
def to_internal_value(self, data): | ||
if data == '' and self.allow_blank: | ||
return '' | ||
|
||
if isinstance(data, (IntegerChoices, TextChoices)) and str(data) != \ | ||
str(data.value): | ||
if isinstance(data, Enum) and str(data) != str(data.value): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can you please add unit test coverage for the changes? |
||
data = data.value | ||
|
||
try: | ||
return self.choice_strings_to_values[str(data)] | ||
except KeyError: | ||
|
@@ -1414,11 +1411,8 @@ def to_internal_value(self, data): | |
def to_representation(self, value): | ||
if value in ('', None): | ||
return value | ||
|
||
if isinstance(value, (IntegerChoices, TextChoices)) and str(value) != \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same goes for this. we are not going to remove django compatibility features. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I should make it clear. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add |
||
str(value.value): | ||
if isinstance(value, Enum) and str(value) != str(value.value): | ||
b7wch marked this conversation as resolved.
Show resolved
Hide resolved
|
||
value = value.value | ||
|
||
return self.choice_strings_to_values.get(str(value), value) | ||
|
||
def iter_options(self): | ||
|
@@ -1442,8 +1436,7 @@ def _set_choices(self, choices): | |
# Allows us to deal with eg. integer choices while supporting either | ||
# integer or string input, but still get the correct datatype out. | ||
self.choice_strings_to_values = { | ||
str(key.value) if isinstance(key, (IntegerChoices, TextChoices)) | ||
and str(key) != str(key.value) else str(key): key for key in self.choices | ||
str(key.value) if isinstance(key, Enum) and str(key) != str(key.value) else str(key): key for key in self.choices | ||
} | ||
|
||
choices = property(_get_choices, _set_choices) | ||
|
@@ -1829,6 +1822,7 @@ class HiddenField(Field): | |
constraint on a pair of fields, as we need some way to include the date in | ||
the validated data. | ||
""" | ||
|
||
def __init__(self, **kwargs): | ||
assert 'default' in kwargs, 'default is a required argument.' | ||
kwargs['write_only'] = True | ||
|
@@ -1858,6 +1852,7 @@ class ExampleSerializer(Serializer): | |
def get_extra_info(self, obj): | ||
return ... # Calculate some data to return. | ||
""" | ||
|
||
def __init__(self, method_name=None, **kwargs): | ||
self.method_name = method_name | ||
kwargs['source'] = '*' | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
from the test failures it seems that Enum is not defined. you might forgot to import it? or could you check what is the issue?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you, I have added the import statement now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure why you are removing the django compatibility support codes here if isinstance(data, (IntegerChoices, TextChoices)) and str(data) !=
str(data.value):