summaryrefslogtreecommitdiff
path: root/django/contrib/gis/forms
diff options
context:
space:
mode:
authorNick Pope <nick.pope@flightdataservices.com>2017-12-11 12:08:45 +0000
committerTim Graham <timograham@gmail.com>2017-12-11 07:08:45 -0500
commitd13a9e44ded4e93570c6ba42ec84e45ddca2505b (patch)
tree0df16e6538d8794c39bd62b5a46879b8abe6572c /django/contrib/gis/forms
parenta9e5ac823df8ba8b786b6450c967ca378c008d0e (diff)
Fixed #28909 -- Simplified code using tuple/list/set/dict unpacking.
Diffstat (limited to 'django/contrib/gis/forms')
-rw-r--r--django/contrib/gis/forms/widgets.py10
1 files changed, 3 insertions, 7 deletions
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