From 2faa90ec942c6b5f31cf1032847f2a41e8801b3c Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 8 Jun 2018 15:36:53 +0100 Subject: [PATCH] Remove unneeded methods on query classes --- wagtail/search/query.py | 44 +---------------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/wagtail/search/query.py b/wagtail/search/query.py index 14ffc37c9..25c1fc6d9 100644 --- a/wagtail/search/query.py +++ b/wagtail/search/query.py @@ -16,27 +16,6 @@ class SearchQuery: def __invert__(self): return Not(self) - def apply(self, func): - raise NotImplementedError - - def clone(self): - return self.apply(lambda o: o) - - def get_children(self): - return () - - @property - def children(self): - return list(self.get_children()) - - @property - def child(self): - children = self.children - if len(children) != 1: - raise IndexError('`%s` object has %d children, not a single child.' - % self.__class__.__name__, len(children)) - return children[0] - class SearchQueryOperator(SearchQuery): pass @@ -46,13 +25,6 @@ class MultiOperandsSearchQueryOperator(SearchQueryOperator): def __init__(self, subqueries): self.subqueries = subqueries - def apply(self, func): - return func(self.__class__( - [subquery.apply(func) for subquery in self.subqueries])) - - def get_children(self): - yield from self.subqueries - # # Operators @@ -71,12 +43,6 @@ class Not(SearchQueryOperator): def __init__(self, subquery: SearchQuery): self.subquery = subquery - def apply(self, func): - return func(self.__class__(self.subquery.apply(func))) - - def get_children(self): - yield self.subquery - # # Basic query classes @@ -95,14 +61,9 @@ class PlainText(SearchQuery): raise ValueError("`operator` must be either 'or' or 'and'.") self.boost = boost - def apply(self, func): - return func(self.__class__(self.query_string, self.operator, - self.boost)) - class MatchAll(SearchQuery): - def apply(self, func): - return self.__class__() + pass class Boost(SearchQuery): @@ -110,8 +71,5 @@ class Boost(SearchQuery): self.subquery = subquery self.boost = boost - def apply(self, func): - return func(self.__class__(self.subquery.apply(func), self.boost)) - MATCH_ALL = MatchAll()