summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNuno Santos <nsantos@apache.org>2009-11-18 20:43:54 +0000
committerNuno Santos <nsantos@apache.org>2009-11-18 20:43:54 +0000
commit73f7b07353e5e6ea55e968db3f228f1c47d275c1 (patch)
tree9958b82a65af0d45a07e3c2cf3e3f51a2906121f
parent2bddecb9a34dd9f541ac9f7fc8e09c0210b2592f (diff)
downloadqpid-python-73f7b07353e5e6ea55e968db3f228f1c47d275c1.tar.gz
fix handling of localhost ipv6 address when using getaddrinfo
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@881928 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/python/qmf/console.py1
-rw-r--r--qpid/python/qpid/managementdata.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/qpid/python/qmf/console.py b/qpid/python/qmf/console.py
index 7e0341c6c1..859ed94229 100644
--- a/qpid/python/qmf/console.py
+++ b/qpid/python/qmf/console.py
@@ -102,7 +102,6 @@ class BrokerURL(URL):
self.port = 5671
else:
self.port = 5672
- socket.getaddrinfo(self.host, self.port)[0][4][0]
self.authName = None
self.authPass = None
if self.user:
diff --git a/qpid/python/qpid/managementdata.py b/qpid/python/qpid/managementdata.py
index a01dda0a7b..61cb10c134 100644
--- a/qpid/python/qpid/managementdata.py
+++ b/qpid/python/qpid/managementdata.py
@@ -50,7 +50,9 @@ class Broker:
if port: self.port = int(port)
else: self.port = 5672
- self.host = socket.getaddrinfo(host, self.port)[0][4][0]
+ for addr in socket.getaddrinfo(host, self.port):
+ if addr[1] == socket.AF_INET:
+ self.host = addr[4][0]
self.username = user or "guest"
self.password = password or "guest"