diff options
| author | Nathan Fritz <nathan@andyet.net> | 2010-05-26 11:37:01 -0700 |
|---|---|---|
| committer | Nathan Fritz <nathan@andyet.net> | 2010-05-26 11:37:01 -0700 |
| commit | fa92bc866beea0476def1f6bf258b6f3bed4c56f (patch) | |
| tree | f288ee74b5043a22a34cf97fc99be4ff30ac2015 | |
| parent | f4bc9d9722ea57b5f5d22efeb6bc65cb990e1053 (diff) | |
| download | slixmpp-fa92bc866beea0476def1f6bf258b6f3bed4c56f.tar.gz slixmpp-fa92bc866beea0476def1f6bf258b6f3bed4c56f.tar.bz2 slixmpp-fa92bc866beea0476def1f6bf258b6f3bed4c56f.tar.xz slixmpp-fa92bc866beea0476def1f6bf258b6f3bed4c56f.zip | |
fixed dns unicode problem
| -rw-r--r-- | sleekxmpp/__init__.py | 2 | ||||
| -rw-r--r-- | tests/test_pubsubstanzas.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sleekxmpp/__init__.py b/sleekxmpp/__init__.py index 773f7936..263f1f99 100644 --- a/sleekxmpp/__init__.py +++ b/sleekxmpp/__init__.py @@ -96,7 +96,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.server, "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: diff --git a/tests/test_pubsubstanzas.py b/tests/test_pubsubstanzas.py index 5353f907..55407c16 100644 --- a/tests/test_pubsubstanzas.py +++ b/tests/test_pubsubstanzas.py @@ -103,10 +103,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() |