diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2017-08-03 03:21:32 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-08-02 21:21:32 -0400 |
| commit | 7724879b524711d61b7491a4a9c104d9cff2e1e3 (patch) | |
| tree | 05909a5dc15416c79eb9e5bcceea97ef6610f84c | |
| parent | d70432deae847deb1e7760d2a9e4e9877d329ce8 (diff) | |
Removed unused _combine() node argument from various combinable classes.
Unused since f59fd15c4928caf3dfcbd50f6ab47be409a43b01 (Combinable) and
since its introduction in 2d877da85526bad0dad7fd6b1d56b1f924c0116a
(SearchVectorCombinable/SearchQueryCombinable/SearchQuery).
| -rw-r--r-- | django/contrib/postgres/search.py | 8 | ||||
| -rw-r--r-- | django/db/models/expressions.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/django/contrib/postgres/search.py b/django/contrib/postgres/search.py index cc47dbfeb6..889f5253c3 100644 --- a/django/contrib/postgres/search.py +++ b/django/contrib/postgres/search.py @@ -36,7 +36,7 @@ class SearchQueryField(Field): class SearchVectorCombinable: ADD = '||' - def _combine(self, other, connector, reversed, node=None): + def _combine(self, other, connector, reversed): if not isinstance(other, SearchVectorCombinable) or not self.config == other.config: raise TypeError('SearchVector can only be combined with other SearchVectors') if reversed: @@ -96,7 +96,7 @@ class SearchQueryCombinable: BITAND = '&&' BITOR = '||' - def _combine(self, other, connector, reversed, node=None): + def _combine(self, other, connector, reversed): if not isinstance(other, SearchQueryCombinable): raise TypeError( 'SearchQuery can only be combined with other SearchQuerys, ' @@ -153,8 +153,8 @@ class SearchQuery(SearchQueryCombinable, Value): template = '!!({})'.format(template) return template, params - def _combine(self, other, connector, reversed, node=None): - combined = super()._combine(other, connector, reversed, node) + def _combine(self, other, connector, reversed): + combined = super()._combine(other, connector, reversed) combined.output_field = SearchQueryField() return combined diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py index f43bd50c06..15ea2e1e17 100644 --- a/django/db/models/expressions.py +++ b/django/db/models/expressions.py @@ -34,7 +34,7 @@ class Combinable: BITLEFTSHIFT = '<<' BITRIGHTSHIFT = '>>' - def _combine(self, other, connector, reversed, node=None): + def _combine(self, other, connector, reversed): if not hasattr(other, 'resolve_expression'): # everything must be resolvable to an expression if isinstance(other, datetime.timedelta): |