From d13a9e44ded4e93570c6ba42ec84e45ddca2505b Mon Sep 17 00:00:00 2001
From: Nick Pope <nick.pope@flightdataservices.com>
Date: Mon, 11 Dec 2017 12:08:45 +0000
Subject: Fixed #28909 -- Simplified code using tuple/list/set/dict unpacking.

---
 django/contrib/gis/forms/widgets.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'django/contrib/gis/forms/widgets.py')

diff --git a/django/contrib/gis/forms/widgets.py b/django/contrib/gis/forms/widgets.py
index e48ba96865..0ffe2ced77 100644
--- a/django/contrib/gis/forms/widgets.py
+++ b/django/contrib/gis/forms/widgets.py
@@ -60,19 +60,15 @@ class BaseGeometryWidget(Widget):
                         value.srid, self.map_srid, err
                     )
 
-        if attrs is None:
-            attrs = {}
-
-        build_attrs_kwargs = {
+        context.update(self.build_attrs(self.attrs, {
             'name': name,
             'module': 'geodjango_%s' % name.replace('-', '_'),  # JS-safe
             'serialized': self.serialize(value),
             'geom_type': gdal.OGRGeomType(self.attrs['geom_type']),
             'STATIC_URL': settings.STATIC_URL,
             'LANGUAGE_BIDI': translation.get_language_bidi(),
-        }
-        build_attrs_kwargs.update(attrs)
-        context.update(self.build_attrs(self.attrs, build_attrs_kwargs))
+            **(attrs or {}),
+        }))
         return context
 
 
-- 
cgit v1.3