diff options
| author | Mads Jensen <mje@inducks.org> | 2017-03-09 16:17:41 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-06-28 14:07:55 -0400 |
| commit | 550cb3a365dee4edfdd1563224d5304de2a57fda (patch) | |
| tree | fb532f38774ff7619edd2a4532c3daae1ee0ac5a /django/forms/forms.py | |
| parent | 43a4835edf32c57eb74c0eb207c276734a34abcf (diff) | |
Fixed #27818 -- Replaced try/except/pass with contextlib.suppress().
Diffstat (limited to 'django/forms/forms.py')
| -rw-r--r-- | django/forms/forms.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/django/forms/forms.py b/django/forms/forms.py index e2e7c645ff..0b434b24f8 100644 --- a/django/forms/forms.py +++ b/django/forms/forms.py @@ -4,6 +4,7 @@ Form classes import copy from collections import OrderedDict +from contextlib import suppress from django.core.exceptions import NON_FIELD_ERRORS, ValidationError # BoundField is imported for backwards compatibility in Django 1.9 @@ -125,10 +126,8 @@ class BaseForm: return fields = OrderedDict() for key in field_order: - try: + with suppress(KeyError): # ignore unknown fields fields[key] = self.fields.pop(key) - except KeyError: # ignore unknown fields - pass fields.update(self.fields) # add remaining fields in original order self.fields = fields |
