summaryrefslogtreecommitdiff
path: root/django/contrib/postgres
diff options
context:
space:
mode:
Diffstat (limited to 'django/contrib/postgres')
-rw-r--r--django/contrib/postgres/aggregates/general.py2
-rw-r--r--django/contrib/postgres/aggregates/statistics.py8
-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
-rw-r--r--django/contrib/postgres/forms/array.py12
-rw-r--r--django/contrib/postgres/forms/hstore.py2
-rw-r--r--django/contrib/postgres/forms/ranges.py4
-rw-r--r--django/contrib/postgres/functions.py2
-rw-r--r--django/contrib/postgres/indexes.py10
-rw-r--r--django/contrib/postgres/lookups.py2
-rw-r--r--django/contrib/postgres/operations.py2
-rw-r--r--django/contrib/postgres/search.py24
14 files changed, 65 insertions, 65 deletions
diff --git a/django/contrib/postgres/aggregates/general.py b/django/contrib/postgres/aggregates/general.py
index 5b3d22bf98..ac18a516d6 100644
--- a/django/contrib/postgres/aggregates/general.py
+++ b/django/contrib/postgres/aggregates/general.py
@@ -47,7 +47,7 @@ class StringAgg(Aggregate):
def __init__(self, expression, delimiter, distinct=False, **extra):
distinct = 'DISTINCT ' if distinct else ''
- super(StringAgg, self).__init__(expression, delimiter=delimiter, distinct=distinct, **extra)
+ super().__init__(expression, delimiter=delimiter, distinct=distinct, **extra)
def convert_value(self, value, expression, connection, context):
if not value:
diff --git a/django/contrib/postgres/aggregates/statistics.py b/django/contrib/postgres/aggregates/statistics.py
index 89949580be..2af5b6b359 100644
--- a/django/contrib/postgres/aggregates/statistics.py
+++ b/django/contrib/postgres/aggregates/statistics.py
@@ -11,7 +11,7 @@ class StatAggregate(Aggregate):
def __init__(self, y, x, output_field=FloatField()):
if not x or not y:
raise ValueError('Both y and x must be provided.')
- super(StatAggregate, self).__init__(y=y, x=x, output_field=output_field)
+ super().__init__(y=y, x=x, output_field=output_field)
self.x = x
self.y = y
self.source_expressions = self._parse_expressions(self.y, self.x)
@@ -23,7 +23,7 @@ class StatAggregate(Aggregate):
self.y, self.x = exprs
def resolve_expression(self, query=None, allow_joins=True, reuse=None, summarize=False, for_save=False):
- return super(Aggregate, self).resolve_expression(query, allow_joins, reuse, summarize)
+ return super().resolve_expression(query, allow_joins, reuse, summarize)
class Corr(StatAggregate):
@@ -33,7 +33,7 @@ class Corr(StatAggregate):
class CovarPop(StatAggregate):
def __init__(self, y, x, sample=False):
self.function = 'COVAR_SAMP' if sample else 'COVAR_POP'
- super(CovarPop, self).__init__(y, x)
+ super().__init__(y, x)
class RegrAvgX(StatAggregate):
@@ -48,7 +48,7 @@ class RegrCount(StatAggregate):
function = 'REGR_COUNT'
def __init__(self, y, x):
- super(RegrCount, self).__init__(y=y, x=x, output_field=IntegerField())
+ super().__init__(y=y, x=x, output_field=IntegerField())
def convert_value(self, value, expression, connection, context):
if value is None:
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):
diff --git a/django/contrib/postgres/forms/array.py b/django/contrib/postgres/forms/array.py
index 9a9e871a43..d9d864e4f2 100644
--- a/django/contrib/postgres/forms/array.py
+++ b/django/contrib/postgres/forms/array.py
@@ -20,7 +20,7 @@ class SimpleArrayField(forms.CharField):
def __init__(self, base_field, delimiter=',', max_length=None, min_length=None, *args, **kwargs):
self.base_field = base_field
self.delimiter = delimiter
- super(SimpleArrayField, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
if min_length is not None:
self.min_length = min_length
self.validators.append(ArrayMinLengthValidator(int(min_length)))
@@ -57,7 +57,7 @@ class SimpleArrayField(forms.CharField):
return values
def validate(self, value):
- super(SimpleArrayField, self).validate(value)
+ super().validate(value)
errors = []
for index, item in enumerate(value):
try:
@@ -73,7 +73,7 @@ class SimpleArrayField(forms.CharField):
raise ValidationError(errors)
def run_validators(self, value):
- super(SimpleArrayField, self).run_validators(value)
+ super().run_validators(value)
errors = []
for index, item in enumerate(value):
try:
@@ -94,7 +94,7 @@ class SplitArrayWidget(forms.Widget):
def __init__(self, widget, size, **kwargs):
self.widget = widget() if isinstance(widget, type) else widget
self.size = size
- super(SplitArrayWidget, self).__init__(**kwargs)
+ super().__init__(**kwargs)
@property
def is_hidden(self):
@@ -141,7 +141,7 @@ class SplitArrayWidget(forms.Widget):
return self.widget.media
def __deepcopy__(self, memo):
- obj = super(SplitArrayWidget, self).__deepcopy__(memo)
+ obj = super().__deepcopy__(memo)
obj.widget = copy.deepcopy(self.widget)
return obj
@@ -161,7 +161,7 @@ class SplitArrayField(forms.Field):
self.remove_trailing_nulls = remove_trailing_nulls
widget = SplitArrayWidget(widget=base_field.widget, size=size)
kwargs.setdefault('widget', widget)
- super(SplitArrayField, self).__init__(**kwargs)
+ super().__init__(**kwargs)
def clean(self, value):
cleaned_data = []
diff --git a/django/contrib/postgres/forms/hstore.py b/django/contrib/postgres/forms/hstore.py
index 25dceb9fb0..7e046ead37 100644
--- a/django/contrib/postgres/forms/hstore.py
+++ b/django/contrib/postgres/forms/hstore.py
@@ -55,4 +55,4 @@ class HStoreField(forms.CharField):
# the same as an empty dict, if the data or initial value we get
# is None, replace it w/ {}.
initial_value = self.to_python(initial)
- return super(HStoreField, self).has_changed(initial_value, data)
+ return super().has_changed(initial_value, data)
diff --git a/django/contrib/postgres/forms/ranges.py b/django/contrib/postgres/forms/ranges.py
index 9ed95cd7c5..5be166f7d0 100644
--- a/django/contrib/postgres/forms/ranges.py
+++ b/django/contrib/postgres/forms/ranges.py
@@ -21,7 +21,7 @@ class BaseRangeField(forms.MultiValueField):
kwargs['fields'] = [self.base_field(required=False), self.base_field(required=False)]
kwargs.setdefault('required', False)
kwargs.setdefault('require_all_fields', False)
- super(BaseRangeField, self).__init__(**kwargs)
+ super().__init__(**kwargs)
def prepare_value(self, value):
lower_base, upper_base = self.fields
@@ -84,7 +84,7 @@ class DateRangeField(BaseRangeField):
class RangeWidget(MultiWidget):
def __init__(self, base_widget, attrs=None):
widgets = (base_widget, base_widget)
- super(RangeWidget, self).__init__(widgets, attrs)
+ super().__init__(widgets, attrs)
def decompress(self, value):
if value:
diff --git a/django/contrib/postgres/functions.py b/django/contrib/postgres/functions.py
index fc0dae8ece..d17f9cb37d 100644
--- a/django/contrib/postgres/functions.py
+++ b/django/contrib/postgres/functions.py
@@ -7,4 +7,4 @@ class TransactionNow(Func):
def __init__(self, output_field=None, **extra):
if output_field is None:
output_field = DateTimeField()
- super(TransactionNow, self).__init__(output_field=output_field, **extra)
+ super().__init__(output_field=output_field, **extra)
diff --git a/django/contrib/postgres/indexes.py b/django/contrib/postgres/indexes.py
index 2edec371f4..60578e6c16 100644
--- a/django/contrib/postgres/indexes.py
+++ b/django/contrib/postgres/indexes.py
@@ -10,7 +10,7 @@ class BrinIndex(Index):
if pages_per_range is not None and pages_per_range <= 0:
raise ValueError('pages_per_range must be None or a positive integer')
self.pages_per_range = pages_per_range
- super(BrinIndex, self).__init__(fields, name)
+ super().__init__(fields, name)
def __repr__(self):
if self.pages_per_range is not None:
@@ -20,15 +20,15 @@ class BrinIndex(Index):
'pages_per_range': self.pages_per_range,
}
else:
- return super(BrinIndex, self).__repr__()
+ return super().__repr__()
def deconstruct(self):
- path, args, kwargs = super(BrinIndex, self).deconstruct()
+ path, args, kwargs = super().deconstruct()
kwargs['pages_per_range'] = self.pages_per_range
return path, args, kwargs
def get_sql_create_template_values(self, model, schema_editor, using):
- parameters = super(BrinIndex, self).get_sql_create_template_values(model, schema_editor, using=' USING brin')
+ parameters = super().get_sql_create_template_values(model, schema_editor, using=' USING brin')
if self.pages_per_range is not None:
parameters['extra'] = ' WITH (pages_per_range={})'.format(
schema_editor.quote_value(self.pages_per_range)) + parameters['extra']
@@ -39,4 +39,4 @@ class GinIndex(Index):
suffix = 'gin'
def create_sql(self, model, schema_editor):
- return super(GinIndex, self).create_sql(model, schema_editor, using=' USING gin')
+ return super().create_sql(model, schema_editor, using=' USING gin')
diff --git a/django/contrib/postgres/lookups.py b/django/contrib/postgres/lookups.py
index 53a62eacd1..8521b26c6e 100644
--- a/django/contrib/postgres/lookups.py
+++ b/django/contrib/postgres/lookups.py
@@ -58,7 +58,7 @@ class SearchLookup(SearchVectorExact):
def process_lhs(self, qn, connection):
if not isinstance(self.lhs.output_field, SearchVectorField):
self.lhs = SearchVector(self.lhs)
- lhs, lhs_params = super(SearchLookup, self).process_lhs(qn, connection)
+ lhs, lhs_params = super().process_lhs(qn, connection)
return lhs, lhs_params
diff --git a/django/contrib/postgres/operations.py b/django/contrib/postgres/operations.py
index cb45d4f705..7544e38613 100644
--- a/django/contrib/postgres/operations.py
+++ b/django/contrib/postgres/operations.py
@@ -41,7 +41,7 @@ class HStoreExtension(CreateExtension):
self.name = 'hstore'
def database_forwards(self, app_label, schema_editor, from_state, to_state):
- super(HStoreExtension, self).database_forwards(app_label, schema_editor, from_state, to_state)
+ super().database_forwards(app_label, schema_editor, from_state, to_state)
# Register hstore straight away as it cannot be done before the
# extension is installed, a subsequent data migration would use the
# same connection
diff --git a/django/contrib/postgres/search.py b/django/contrib/postgres/search.py
index bc9bb1052b..9a773db1d5 100644
--- a/django/contrib/postgres/search.py
+++ b/django/contrib/postgres/search.py
@@ -11,7 +11,7 @@ class SearchVectorExact(Lookup):
if not hasattr(self.rhs, 'resolve_expression'):
config = getattr(self.lhs, 'config', None)
self.rhs = SearchQuery(self.rhs, config=config)
- rhs, rhs_params = super(SearchVectorExact, self).process_rhs(qn, connection)
+ rhs, rhs_params = super().process_rhs(qn, connection)
return rhs, rhs_params
def as_sql(self, qn, connection):
@@ -51,7 +51,7 @@ class SearchVector(SearchVectorCombinable, Func):
config = None
def __init__(self, *expressions, **extra):
- super(SearchVector, self).__init__(*expressions, **extra)
+ super().__init__(*expressions, **extra)
self.source_expressions = [
Coalesce(expression, Value('')) for expression in self.source_expressions
]
@@ -62,7 +62,7 @@ class SearchVector(SearchVectorCombinable, Func):
self.weight = weight
def resolve_expression(self, query=None, allow_joins=True, reuse=None, summarize=False, for_save=False):
- resolved = super(SearchVector, self).resolve_expression(query, allow_joins, reuse, summarize, for_save)
+ resolved = super().resolve_expression(query, allow_joins, reuse, summarize, for_save)
if self.config:
if not hasattr(self.config, 'resolve_expression'):
resolved.config = Value(self.config).resolve_expression(query, allow_joins, reuse, summarize, for_save)
@@ -78,7 +78,7 @@ class SearchVector(SearchVectorCombinable, Func):
template = "%(function)s({}::regconfig, %(expressions)s)".format(config_sql.replace('%', '%%'))
else:
template = self.template
- sql, params = super(SearchVector, self).as_sql(compiler, connection, function=function, template=template)
+ sql, params = super().as_sql(compiler, connection, function=function, template=template)
extra_params = []
if self.weight:
weight_sql, extra_params = compiler.compile(self.weight)
@@ -89,7 +89,7 @@ class SearchVector(SearchVectorCombinable, Func):
class CombinedSearchVector(SearchVectorCombinable, CombinedExpression):
def __init__(self, lhs, connector, rhs, config, output_field=None):
self.config = config
- super(CombinedSearchVector, self).__init__(lhs, connector, rhs, output_field)
+ super().__init__(lhs, connector, rhs, output_field)
class SearchQueryCombinable:
@@ -132,10 +132,10 @@ class SearchQuery(SearchQueryCombinable, Value):
def __init__(self, value, output_field=None, **extra):
self.config = extra.pop('config', self.config)
self.invert = extra.pop('invert', self.invert)
- super(SearchQuery, self).__init__(value, output_field=output_field)
+ super().__init__(value, output_field=output_field)
def resolve_expression(self, query=None, allow_joins=True, reuse=None, summarize=False, for_save=False):
- resolved = super(SearchQuery, self).resolve_expression(query, allow_joins, reuse, summarize, for_save)
+ resolved = super().resolve_expression(query, allow_joins, reuse, summarize, for_save)
if self.config:
if not hasattr(self.config, 'resolve_expression'):
resolved.config = Value(self.config).resolve_expression(query, allow_joins, reuse, summarize, for_save)
@@ -156,7 +156,7 @@ class SearchQuery(SearchQueryCombinable, Value):
return template, params
def _combine(self, other, connector, reversed, node=None):
- combined = super(SearchQuery, self)._combine(other, connector, reversed, node)
+ combined = super()._combine(other, connector, reversed, node)
combined.output_field = SearchQueryField()
return combined
@@ -171,7 +171,7 @@ class SearchQuery(SearchQueryCombinable, Value):
class CombinedSearchQuery(SearchQueryCombinable, CombinedExpression):
def __init__(self, lhs, connector, rhs, config, output_field=None):
self.config = config
- super(CombinedSearchQuery, self).__init__(lhs, connector, rhs, output_field)
+ super().__init__(lhs, connector, rhs, output_field)
class SearchRank(Func):
@@ -187,7 +187,7 @@ class SearchRank(Func):
if weights is not None and not hasattr(weights, 'resolve_expression'):
weights = Value(weights)
self.weights = weights
- super(SearchRank, self).__init__(vector, query, **extra)
+ super().__init__(vector, query, **extra)
def as_sql(self, compiler, connection, function=None, template=None):
extra_params = []
@@ -197,7 +197,7 @@ class SearchRank(Func):
template = '%(function)s(%(weights)s, %(expressions)s)'
weight_sql, extra_params = compiler.compile(self.weights)
extra_context['weights'] = weight_sql
- sql, params = super(SearchRank, self).as_sql(
+ sql, params = super().as_sql(
compiler, connection,
function=function, template=template, **extra_context
)
@@ -211,7 +211,7 @@ class TrigramBase(Func):
def __init__(self, expression, string, **extra):
if not hasattr(string, 'resolve_expression'):
string = Value(string)
- super(TrigramBase, self).__init__(expression, string, output_field=FloatField(), **extra)
+ super().__init__(expression, string, output_field=FloatField(), **extra)
class TrigramSimilarity(TrigramBase):
generated by cgit v1.3 (git 2.53.0) at 2026-05-02 03:00:51 +0000