iElasticsearch 2.0 exposes just host:port in nodes.info

Fixes elastic#293

Author: honzakral

elasticsearch/transport.py

@@ -8,8 +8,8 @@
 from .exceptions import ConnectionError, TransportError, SerializationError, \
                         ConnectionTimeout, ImproperlyConfigured
 
-# get ip/port from "inet[wind/127.0.0.1:9200]"
-ADDRESS_RE = re.compile(r'/(?P<host>[\.:0-9a-f]*):(?P<port>[0-9]+)\]?$')
+# get ip/port from "127.0.0.1:9200"
+ADDRESS_RE = re.compile(r'^(?P<host>[\.:0-9a-f]*):(?P<port>[0-9]+)?$')
 
 
 def get_host_info(node_info, host):

test_elasticsearch/test_transport.py

@@ -29,11 +29,11 @@ def perform_request(self, *args, **kwargs):
     "nodes" : {
         "wE_6OGBNSjGksbONNncIbg" : {
             "name" : "Nightwind",
-            "transport_address" : "inet[/127.0.0.1:9300]",
+            "transport_address" : "127.0.0.1:9300",
             "hostname" : "wind",
             "version" : "0.20.4",
-            "http_address" : "inet[/1.1.1.1:123]",
-            "thrift_address" : "/1.1.1.1:9500]"
+            "http_address" : "1.1.1.1:123",
+            "thrift_address" : "1.1.1.1:9500"
         }
     }
 }'''