summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
authorДилян Палаузов <Dilyan.Palauzov@db.com>2017-12-27 00:14:12 +0530
committerTim Graham <timograham@gmail.com>2017-12-26 17:11:15 -0500
commit4c599ece57fa009cf3615f09497f81bfa6a585a7 (patch)
tree1f27a7e76024aaa5bc69356826061262d35d0be3 /django/forms
parentc21f158295d92e35caf96436bfdbbff554fc5569 (diff)
Fixed #28930 -- Simplified code with any() and all().
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/forms.py16
1 files changed, 5 insertions, 11 deletions
diff --git a/django/forms/forms.py b/django/forms/forms.py
index d8a05e3583..1be7814993 100644
--- a/django/forms/forms.py
+++ b/django/forms/forms.py
@@ -351,13 +351,10 @@ class BaseForm:
del self.cleaned_data[field]
def has_error(self, field, code=None):
- if code is None:
- return field in self.errors
- if field in self.errors:
- for error in self.errors.as_data()[field]:
- if error.code == code:
- return True
- return False
+ return field in self.errors and (
+ code is None or
+ any(error.code == code for error in self.errors.as_data()[field])
+ )
def full_clean(self):
"""
@@ -464,10 +461,7 @@ class BaseForm:
Return True if the form needs to be multipart-encoded, i.e. it has
FileInput, or False otherwise.
"""
- for field in self.fields.values():
- if field.widget.needs_multipart_form:
- return True
- return False
+ return any(field.widget.needs_multipart_form for field in self.fields.values())
def hidden_fields(self):
"""