test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #30095 -- Simplified Field._check_choices() a bit. 

Using an internal is_value() hook to check whether Field.choices
is iterable is misleading.
This commit is contained in:
Mariusz Felisiak 2019-10-31 20:04:47 +01:00 committed by GitHub
parent 3cf907c20c
commit a9bd01d363
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/models/fields/__init__.py
View File

@ -241,10 +241,10 @@ class Field(RegisterLookupMixin):
if not self.choices: if not self.choices:
return [] return []
def is_value(value, accept_promise=True): def is_value(value):
return isinstance(value, (str, Promise) if accept_promise else str) or not is_iterable(value) return isinstance(value, (str, Promise)) or not is_iterable(value)
if is_value(self.choices, accept_promise=False): if not is_iterable(self.choices) or isinstance(self.choices, str):
return [ return [
checks.Error( checks.Error(
"'choices' must be an iterable (e.g., a list or tuple).", "'choices' must be an iterable (e.g., a list or tuple).",