From 550cb3a365dee4edfdd1563224d5304de2a57fda Mon Sep 17 00:00:00 2001
From: Mads Jensen <mje@inducks.org>
Date: Thu, 9 Mar 2017 16:17:41 +0100
Subject: Fixed #27818 -- Replaced try/except/pass with contextlib.suppress().

---
 django/forms/forms.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'django/forms/forms.py')

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
 
-- 
cgit v1.3