Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mrDoctorWho/xmpppy.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralkorgun <alkorgun@gmail.com>2014-02-25 18:55:43 +0400
committeralkorgun <alkorgun@gmail.com>2014-02-25 18:55:43 +0400
commit1acb471d2e3ea18c0f3bd404b8486f132b9032c1 (patch)
treeaec1c7fa773b84fa2562918d1c3aa36e70d68332
parentde79b914b49844e686cc15381b7511fd75e151f6 (diff)
one little fix and one little improvement
-rw-r--r--xmpp/protocol.py4
-rw-r--r--xmpp/transports.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/xmpp/protocol.py b/xmpp/protocol.py
index e557377..2260d6d 100644
--- a/xmpp/protocol.py
+++ b/xmpp/protocol.py
@@ -837,11 +837,11 @@ class Iq(Protocol):
if queryNS:
self.setQueryNS(queryNS)
- def getQuery(self):
+ def getQuery(self, namespace=None):
"""
Returns the query node.
"""
- return self.getTag("query")
+ return self.getTag("query", namespace=namespace)
def getQueryNS(self):
"""
diff --git a/xmpp/transports.py b/xmpp/transports.py
index 9e42225..c733011 100644
--- a/xmpp/transports.py
+++ b/xmpp/transports.py
@@ -128,7 +128,7 @@ class TCPsocket(PlugIn):
if response.answers:
# Sort by priority, according to RFC 2782.
answers = sorted(response.answers, key=lambda a: a["data"][0])
- (port, host) = answers[0]["data"][2:]
+ (port, host) = answers[0]["data"][2:][:2]
server = str(host), int(port)
except dns.DNSError:
self.DEBUG("An error occurred while looking up %s." % query, "warn")