Permalink
Browse files

Merge pull request #102 from merrellb/master

ElasticSearchModel.__repr__ seemed to be causing infinite recursion
  • Loading branch information...
2 parents 38a0f68 + b35d213 commit c248f82c9489192246d3314ddc23bfa82ca492e0 Alberto Paro committed Sep 22, 2011
Showing with 1 addition and 3 deletions.
  1. +1 −3 pyes/es.py
View
@@ -64,9 +64,6 @@ def __init__(self, *args, **kwargs):
else:
self.update(dict(*args, **kwargs))
- def __repr__(self):
- return repr(self)
-
def save(self, bulk=False, id=None):
"""
Save the object and returns id
@@ -1306,6 +1303,7 @@ def _do_search(self, auto_increment=False):
else:
try:
self._results = self.connection.search_scroll(self.scroller_id, self.scroller_parameters.get("scroll", "10m"))
+ self.scroller_id = self._results['_scroll_id']
except ReduceSearchPhaseException:
#bad hack, should be not hits on the last iteration
self._results['hits']['hits'] = []

0 comments on commit c248f82

Please sign in to comment.