From 4c599ece57fa009cf3615f09497f81bfa6a585a7 Mon Sep 17 00:00:00 2001 From: Дилян Палаузов Date: Wed, 27 Dec 2017 00:14:12 +0530 Subject: Fixed #28930 -- Simplified code with any() and all(). --- django/forms/forms.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'django/forms') 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): """ -- cgit v1.3