adds dynamic class-based repr (elastic#713)

Author: 0bsearch

elasticsearch/client/__init__.py

@@ -183,10 +183,10 @@ def __repr__(self):
  try:
  # get a list of all connections
  cons = self.transport.hosts
- # truncate to 10 if there are too many
+ # truncate to 5 if there are too many
  if len(cons) > 5:
  cons = cons[:5] + ['...']
- return '<Elasticsearch(%r)>' % cons
+ return '<{cls}({cons})>'.format(cls=self.__class__.__name__, cons=cons)
  except:
  # probably operating on custom transport and connection_pool, ignore
  return super(Elasticsearch, self).__repr__()

test_elasticsearch/test_client/__init__.py

@@ -75,12 +75,18 @@ def test_from_in_search(self):
  def test_repr_contains_hosts(self):
  self.assertEquals('<Elasticsearch([{}])>', repr(self.client))
 
+ def test_repr_subclass(self):
+ class OtherElasticsearch(Elasticsearch): pass
+ self.assertEqual('<OtherElasticsearch([{}])>', repr(OtherElasticsearch()))
+
  def test_repr_contains_hosts_passed_in(self):
  self.assertIn("es.org", repr(Elasticsearch(['es.org:123'])))
 
- def test_repr_truncates_host_to_10(self):
- hosts = [{"host": "es" + str(i)} for i in range(20)]
- self.assertNotIn("es5", repr(Elasticsearch(hosts)))
+ def test_repr_truncates_host_to_5(self):
+ hosts = [{"host": "es" + str(i)} for i in range(10)]
+ es = Elasticsearch(hosts)
+ self.assertNotIn("es5", repr(es))
+ self.assertIn('...', repr(es))
 
  def test_index_uses_post_if_id_is_empty(self):
  self.client.index(index='my-index', doc_type='test-doc', id='', body={})