mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-29 17:36:49 +01:00
Code Issues Releases Wiki Activity

deprecation/1.4: Removed ElasticSearchQuery.to_es

Browse Source
This commit is contained in:
Karl Hobley 2015-12-20 13:02:58 +00:00
parent 8b283cdac7
commit 94eb91c2fe
1 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
wagtail/wagtailsearch/backends/elasticsearch.py
View File

@ -1,9 +1,7 @@
from __future__ import absolute_import from __future__ import absolute_import
import json import json
import warnings
from django.utils import six
from django.utils.six.moves.urllib.parse import urlparse from django.utils.six.moves.urllib.parse import urlparse
from elasticsearch import Elasticsearch, NotFoundError from elasticsearch import Elasticsearch, NotFoundError
@ -14,7 +12,6 @@ from django.utils.crypto import get_random_string
from wagtail.wagtailsearch.backends.base import BaseSearch, BaseSearchQuery, BaseSearchResults from wagtail.wagtailsearch.backends.base import BaseSearch, BaseSearchQuery, BaseSearchResults
from wagtail.wagtailsearch.index import SearchField, FilterField, RelatedFields, class_is_indexed from wagtail.wagtailsearch.index import SearchField, FilterField, RelatedFields, class_is_indexed
from wagtail.utils.deprecation import RemovedInWagtail14Warning
INDEX_SETTINGS = { INDEX_SETTINGS = {
@ -399,37 +396,12 @@ class ElasticSearchQuery(BaseSearchQuery):
def __repr__(self): def __repr__(self):
return json.dumps(self.get_query()) return json.dumps(self.get_query())
def to_es(self):
warnings.warn(
"The ElasticSearchQuery.to_es() method is deprecated. "
"Please use the ElasticSearchQuery.get_query() method instead.",
RemovedInWagtail14Warning, stacklevel=2)
return self.get_query()
class ElasticSearchResults(BaseSearchResults): class ElasticSearchResults(BaseSearchResults):
def _get_es_body(self, for_count=False): def _get_es_body(self, for_count=False):
# If to_es has been overridden, call it and raise a deprecation warning body = {
if ( 'query': self.query.get_query()
isinstance(self.query, ElasticSearchQuery) }
and six.get_method_function(self.query.to_es)
!= ElasticSearchQuery.to_es
):
warnings.warn(
"The .to_es() method on Elasticsearch query classes is deprecated. "
"Please rename {class_name}.to_es() to {class_name}.get_query()".format(
class_name=self.query.__class__.__name__
),
RemovedInWagtail14Warning, stacklevel=2)
body = {
'query': self.query.to_es(),
}
else:
body = {
'query': self.query.get_query()
}
if not for_count: if not for_count:
sort = self.query.get_sort() sort = self.query.get_sort()