summaryrefslogtreecommitdiff
path: root/django/contrib/postgres/fields
diff options
context:
space:
mode:
authorchillaranand <anand21nanda@gmail.com>2017-01-21 18:43:44 +0530
committerTim Graham <timograham@gmail.com>2017-01-25 12:23:46 -0500
commitd6eaf7c0183cd04b78f2a55e1d60bb7e59598310 (patch)
treeab02fd9949d4bfa23e27dea45e213ce334c883f0 /django/contrib/postgres/fields
parentdc165ec8e5698ffc6dee6b510f1f92c9fd7467fe (diff)
Refs #23919 -- Replaced super(ClassName, self) with super().
Diffstat (limited to 'django/contrib/postgres/fields')
-rw-r--r--django/contrib/postgres/fields/array.py30
-rw-r--r--django/contrib/postgres/fields/hstore.py10
-rw-r--r--django/contrib/postgres/fields/jsonb.py16
-rw-r--r--django/contrib/postgres/fields/ranges.py6
4 files changed, 31 insertions, 31 deletions
diff --git a/django/contrib/postgres/fields/array.py b/django/contrib/postgres/fields/array.py
index ce4c7b8c3d..15cbf5e45e 100644
--- a/django/contrib/postgres/fields/array.py
+++ b/django/contrib/postgres/fields/array.py
@@ -31,7 +31,7 @@ class ArrayField(Field):
# implements it.
if hasattr(self.base_field, 'from_db_value'):
self.from_db_value = self._from_db_value
- super(ArrayField, self).__init__(**kwargs)
+ super().__init__(**kwargs)
@property
def model(self):
@@ -46,7 +46,7 @@ class ArrayField(Field):
self.base_field.model = model
def check(self, **kwargs):
- errors = super(ArrayField, self).check(**kwargs)
+ errors = super().check(**kwargs)
if self.base_field.remote_field:
errors.append(
checks.Error(
@@ -70,7 +70,7 @@ class ArrayField(Field):
return errors
def set_attributes_from_name(self, name):
- super(ArrayField, self).set_attributes_from_name(name)
+ super().set_attributes_from_name(name)
self.base_field.set_attributes_from_name(name)
@property
@@ -87,7 +87,7 @@ class ArrayField(Field):
return value
def deconstruct(self):
- name, path, args, kwargs = super(ArrayField, self).deconstruct()
+ name, path, args, kwargs = super().deconstruct()
if path == 'django.contrib.postgres.fields.array.ArrayField':
path = 'django.contrib.postgres.fields.ArrayField'
kwargs.update({
@@ -125,7 +125,7 @@ class ArrayField(Field):
return json.dumps(values)
def get_transform(self, name):
- transform = super(ArrayField, self).get_transform(name)
+ transform = super().get_transform(name)
if transform:
return transform
if '_' not in name:
@@ -146,7 +146,7 @@ class ArrayField(Field):
return SliceTransformFactory(start, end)
def validate(self, value, model_instance):
- super(ArrayField, self).validate(value, model_instance)
+ super().validate(value, model_instance)
for index, part in enumerate(value):
try:
self.base_field.validate(part, model_instance)
@@ -165,7 +165,7 @@ class ArrayField(Field):
)
def run_validators(self, value):
- super(ArrayField, self).run_validators(value)
+ super().run_validators(value)
for index, part in enumerate(value):
try:
self.base_field.run_validators(part)
@@ -184,13 +184,13 @@ class ArrayField(Field):
'max_length': self.size,
}
defaults.update(kwargs)
- return super(ArrayField, self).formfield(**defaults)
+ return super().formfield(**defaults)
@ArrayField.register_lookup
class ArrayContains(lookups.DataContains):
def as_sql(self, qn, connection):
- sql, params = super(ArrayContains, self).as_sql(qn, connection)
+ sql, params = super().as_sql(qn, connection)
sql = '%s::%s' % (sql, self.lhs.output_field.db_type(connection))
return sql, params
@@ -198,7 +198,7 @@ class ArrayContains(lookups.DataContains):
@ArrayField.register_lookup
class ArrayContainedBy(lookups.ContainedBy):
def as_sql(self, qn, connection):
- sql, params = super(ArrayContainedBy, self).as_sql(qn, connection)
+ sql, params = super().as_sql(qn, connection)
sql = '%s::%s' % (sql, self.lhs.output_field.db_type(connection))
return sql, params
@@ -206,7 +206,7 @@ class ArrayContainedBy(lookups.ContainedBy):
@ArrayField.register_lookup
class ArrayExact(Exact):
def as_sql(self, qn, connection):
- sql, params = super(ArrayExact, self).as_sql(qn, connection)
+ sql, params = super().as_sql(qn, connection)
sql = '%s::%s' % (sql, self.lhs.output_field.db_type(connection))
return sql, params
@@ -214,7 +214,7 @@ class ArrayExact(Exact):
@ArrayField.register_lookup
class ArrayOverlap(lookups.Overlap):
def as_sql(self, qn, connection):
- sql, params = super(ArrayOverlap, self).as_sql(qn, connection)
+ sql, params = super().as_sql(qn, connection)
sql = '%s::%s' % (sql, self.lhs.output_field.db_type(connection))
return sql, params
@@ -236,7 +236,7 @@ class ArrayLenTransform(Transform):
@ArrayField.register_lookup
class ArrayInLookup(In):
def get_prep_lookup(self):
- values = super(ArrayInLookup, self).get_prep_lookup()
+ values = super().get_prep_lookup()
# In.process_rhs() expects values to be hashable, so convert lists
# to tuples.
prepared_values = []
@@ -251,7 +251,7 @@ class ArrayInLookup(In):
class IndexTransform(Transform):
def __init__(self, index, base_field, *args, **kwargs):
- super(IndexTransform, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
self.index = index
self.base_field = base_field
@@ -277,7 +277,7 @@ class IndexTransformFactory:
class SliceTransform(Transform):
def __init__(self, start, end, *args, **kwargs):
- super(SliceTransform, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
self.start = start
self.end = end
diff --git a/django/contrib/postgres/fields/hstore.py b/django/contrib/postgres/fields/hstore.py
index 5e2e6c3155..28b7c19c7d 100644
--- a/django/contrib/postgres/fields/hstore.py
+++ b/django/contrib/postgres/fields/hstore.py
@@ -21,13 +21,13 @@ class HStoreField(Field):
return 'hstore'
def get_transform(self, name):
- transform = super(HStoreField, self).get_transform(name)
+ transform = super().get_transform(name)
if transform:
return transform
return KeyTransformFactory(name)
def validate(self, value, model_instance):
- super(HStoreField, self).validate(value, model_instance)
+ super().validate(value, model_instance)
for key, val in value.items():
if not isinstance(val, str) and val is not None:
raise exceptions.ValidationError(
@@ -49,10 +49,10 @@ class HStoreField(Field):
'form_class': forms.HStoreField,
}
defaults.update(kwargs)
- return super(HStoreField, self).formfield(**defaults)
+ return super().formfield(**defaults)
def get_prep_value(self, value):
- value = super(HStoreField, self).get_prep_value(value)
+ value = super().get_prep_value(value)
if isinstance(value, dict):
prep_value = {}
@@ -80,7 +80,7 @@ class KeyTransform(Transform):
output_field = TextField()
def __init__(self, key_name, *args, **kwargs):
- super(KeyTransform, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
self.key_name = key_name
def as_sql(self, compiler, connection):
diff --git a/django/contrib/postgres/fields/jsonb.py b/django/contrib/postgres/fields/jsonb.py
index 43997050fe..0bb6e7bed1 100644
--- a/django/contrib/postgres/fields/jsonb.py
+++ b/django/contrib/postgres/fields/jsonb.py
@@ -18,7 +18,7 @@ class JsonAdapter(Json):
"""
def __init__(self, adapted, dumps=None, encoder=None):
self.encoder = encoder
- super(JsonAdapter, self).__init__(adapted, dumps=dumps)
+ super().__init__(adapted, dumps=dumps)
def dumps(self, obj):
options = {'cls': self.encoder} if self.encoder else {}
@@ -36,19 +36,19 @@ class JSONField(Field):
if encoder and not callable(encoder):
raise ValueError("The encoder parameter must be a callable object.")
self.encoder = encoder
- super(JSONField, self).__init__(verbose_name, name, **kwargs)
+ super().__init__(verbose_name, name, **kwargs)
def db_type(self, connection):
return 'jsonb'
def deconstruct(self):
- name, path, args, kwargs = super(JSONField, self).deconstruct()
+ name, path, args, kwargs = super().deconstruct()
if self.encoder is not None:
kwargs['encoder'] = self.encoder
return name, path, args, kwargs
def get_transform(self, name):
- transform = super(JSONField, self).get_transform(name)
+ transform = super().get_transform(name)
if transform:
return transform
return KeyTransformFactory(name)
@@ -59,7 +59,7 @@ class JSONField(Field):
return value
def validate(self, value, model_instance):
- super(JSONField, self).validate(value, model_instance)
+ super().validate(value, model_instance)
options = {'cls': self.encoder} if self.encoder else {}
try:
json.dumps(value, **options)
@@ -76,7 +76,7 @@ class JSONField(Field):
def formfield(self, **kwargs):
defaults = {'form_class': forms.JSONField}
defaults.update(kwargs)
- return super(JSONField, self).formfield(**defaults)
+ return super().formfield(**defaults)
JSONField.register_lookup(lookups.DataContains)
@@ -91,7 +91,7 @@ class KeyTransform(Transform):
nested_operator = '#>'
def __init__(self, key_name, *args, **kwargs):
- super(KeyTransform, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
self.key_name = key_name
def as_sql(self, compiler, connection):
@@ -129,7 +129,7 @@ class KeyTransformTextLookupMixin:
key_text_transform = KeyTextTransform(
key_transform.key_name, *key_transform.source_expressions, **key_transform.extra
)
- super(KeyTransformTextLookupMixin, self).__init__(key_text_transform, *args, **kwargs)
+ super().__init__(key_text_transform, *args, **kwargs)
class KeyTransformIExact(KeyTransformTextLookupMixin, builtin_lookups.IExact):
diff --git a/django/contrib/postgres/fields/ranges.py b/django/contrib/postgres/fields/ranges.py
index 840417a58f..41acc8dcb2 100644
--- a/django/contrib/postgres/fields/ranges.py
+++ b/django/contrib/postgres/fields/ranges.py
@@ -20,7 +20,7 @@ class RangeField(models.Field):
# Initializing base_field here ensures that its model matches the model for self.
if hasattr(self, 'base_field'):
self.base_field = self.base_field()
- super(RangeField, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
@property
def model(self):
@@ -56,7 +56,7 @@ class RangeField(models.Field):
return value
def set_attributes_from_name(self, name):
- super(RangeField, self).set_attributes_from_name(name)
+ super().set_attributes_from_name(name)
self.base_field.set_attributes_from_name(name)
def value_to_string(self, obj):
@@ -78,7 +78,7 @@ class RangeField(models.Field):
def formfield(self, **kwargs):
kwargs.setdefault('form_class', self.form_field)
- return super(RangeField, self).formfield(**kwargs)
+ return super().formfield(**kwargs)
class IntegerRangeField(RangeField):