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/postgres/fields/array.py  | 7 +++----
 django/contrib/postgres/fields/hstore.py | 7 +++----
 django/contrib/postgres/fields/jsonb.py  | 7 ++++---
 3 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'django/contrib/postgres/fields')

diff --git a/django/contrib/postgres/fields/array.py b/django/contrib/postgres/fields/array.py
index 6a8fbd0e91..bf5666e2da 100644
--- a/django/contrib/postgres/fields/array.py
+++ b/django/contrib/postgres/fields/array.py
@@ -183,13 +183,12 @@ class ArrayField(CheckFieldDefaultMixin, Field):
                 )
 
     def formfield(self, **kwargs):
-        defaults = {
+        return super().formfield(**{
             'form_class': SimpleArrayField,
             'base_field': self.base_field.formfield(),
             'max_length': self.size,
-        }
-        defaults.update(kwargs)
-        return super().formfield(**defaults)
+            **kwargs,
+        })
 
 
 @ArrayField.register_lookup
diff --git a/django/contrib/postgres/fields/hstore.py b/django/contrib/postgres/fields/hstore.py
index 82f731f8bf..d47b34d459 100644
--- a/django/contrib/postgres/fields/hstore.py
+++ b/django/contrib/postgres/fields/hstore.py
@@ -44,11 +44,10 @@ class HStoreField(Field):
         return json.dumps(self.value_from_object(obj))
 
     def formfield(self, **kwargs):
-        defaults = {
+        return super().formfield(**{
             'form_class': forms.HStoreField,
-        }
-        defaults.update(kwargs)
-        return super().formfield(**defaults)
+            **kwargs,
+        })
 
     def get_prep_value(self, value):
         value = super().get_prep_value(value)
diff --git a/django/contrib/postgres/fields/jsonb.py b/django/contrib/postgres/fields/jsonb.py
index 4ed441003b..3c27607acd 100644
--- a/django/contrib/postgres/fields/jsonb.py
+++ b/django/contrib/postgres/fields/jsonb.py
@@ -77,9 +77,10 @@ class JSONField(CheckFieldDefaultMixin, Field):
         return self.value_from_object(obj)
 
     def formfield(self, **kwargs):
-        defaults = {'form_class': forms.JSONField}
-        defaults.update(kwargs)
-        return super().formfield(**defaults)
+        return super().formfield(**{
+            'form_class': forms.JSONField,
+            **kwargs,
+        })
 
 
 JSONField.register_lookup(lookups.DataContains)
-- 
cgit v1.3