summaryrefslogtreecommitdiff
path: root/django/contrib/postgres/search.py
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/search.py
parentdc165ec8e5698ffc6dee6b510f1f92c9fd7467fe (diff)
downloaddjango-d6eaf7c0183cd04b78f2a55e1d60bb7e59598310.tar.gz
Refs #23919 -- Replaced super(ClassName, self) with super().
Diffstat (limited to 'django/contrib/postgres/search.py')
-rw-r--r--django/contrib/postgres/search.py24
1 files changed, 12 insertions, 12 deletions
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):