diff options
| author | Brian Beggs <macdiesel@gmail.com> | 2010-07-01 09:17:45 -0400 |
|---|---|---|
| committer | Brian Beggs <macdiesel@gmail.com> | 2010-07-01 09:17:45 -0400 |
| commit | d763795b2cb01fd90b8d7661bfafdb80d84e13c8 (patch) | |
| tree | a3338228fae061aebed3b6e69d231e22ec5351f2 | |
| parent | fff54eaf2f069db22c2a0a3cf0e522d628e188b3 (diff) | |
| parent | 1e3a6e1b5f06d307295be6b4ccaf75bf2a48399d (diff) | |
| download | slixmpp-d763795b2cb01fd90b8d7661bfafdb80d84e13c8.tar.gz slixmpp-d763795b2cb01fd90b8d7661bfafdb80d84e13c8.tar.bz2 slixmpp-d763795b2cb01fd90b8d7661bfafdb80d84e13c8.tar.xz slixmpp-d763795b2cb01fd90b8d7661bfafdb80d84e13c8.zip | |
Merge remote branch 'fritzy/master'
Conflicts:
sleekxmpp/__init__.py
sleekxmpp/basexmpp.py
sleekxmpp/stanza/error.py
| -rw-r--r-- | sleekxmpp/__init__.py | 5 | ||||
| -rw-r--r-- | sleekxmpp/stanza/error.py | 8 | ||||
| -rw-r--r-- | tests/test_pubsubstanzas.py | 3 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sleekxmpp/__init__.py b/sleekxmpp/__init__.py index cf43ede7..b62e35db 100644 --- a/sleekxmpp/__init__.py +++ b/sleekxmpp/__init__.py @@ -116,8 +116,7 @@ class ClientXMPP(basexmpp, XMLStream): else: logging.debug("Since no address is supplied, attempting SRV lookup.") try: - answers = dns.resolver.query("_xmpp-client._tcp.%s" % self.domain, - dns.rdatatype.SRV ) + answers = dns.resolver.query("_xmpp-client._tcp.%s" % self.server, dns.rdatatype.SRV) except dns.resolver.NXDOMAIN: logging.debug("No appropriate SRV record found. Using JID server name.") else: @@ -335,4 +334,4 @@ def md5digest(data): except ImportError: import md5 md5 = md5.new(data) - return md5.hexdigest()
\ No newline at end of file + return md5.hexdigest() diff --git a/sleekxmpp/stanza/error.py b/sleekxmpp/stanza/error.py index ee46722a..3346ceb2 100644 --- a/sleekxmpp/stanza/error.py +++ b/sleekxmpp/stanza/error.py @@ -1,9 +1,9 @@ """ - SleekXMPP: The Sleek XMPP Library - Copyright (C) 2010 Nathanael C. Fritz - This file is part of SleekXMPP. + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. - See the file license.txt for copying permission. + See the file license.txt for copying permission. """ from .. xmlstream.stanzabase import ElementBase, ET diff --git a/tests/test_pubsubstanzas.py b/tests/test_pubsubstanzas.py index dc41fc30..089ee180 100644 --- a/tests/test_pubsubstanzas.py +++ b/tests/test_pubsubstanzas.py @@ -118,10 +118,11 @@ class testpubsubstanzas(unittest.TestCase): iq = self.ps.Iq() iq['pubsub_owner']['default'] iq['pubsub_owner']['default']['node'] = 'mynode' + iq['pubsub_owner']['default']['type'] = 'leaf' form = xep_0004.Form() form.addField('pubsub#title', ftype='text-single', value='This thing is awesome') iq['pubsub_owner']['default']['config'] = form - xmlstring = """<iq id="0"><pubsub xmlns="http://jabber.org/protocol/pubsub#owner"><default node="mynode"><x xmlns="jabber:x:data" type="form"><field var="pubsub#title" type="text-single"><value>This thing is awesome</value></field></x></default></pubsub></iq>""" + xmlstring = """<iq id="0"><pubsub xmlns="http://jabber.org/protocol/pubsub#owner"><default node="mynode" type="leaf"><x xmlns="jabber:x:data" type="form"><field var="pubsub#title" type="text-single"><value>This thing is awesome</value></field></x></default></pubsub></iq>""" iq2 = self.ps.Iq(None, self.ps.ET.fromstring(xmlstring)) iq3 = self.ps.Iq() values = iq2.getValues() |