From fa92bc866beea0476def1f6bf258b6f3bed4c56f Mon Sep 17 00:00:00 2001
From: Nathan Fritz <nathan@andyet.net>
Date: Wed, 26 May 2010 11:37:01 -0700
Subject: [PATCH] fixed dns unicode problem

---
 sleekxmpp/__init__.py       | 2 +-
 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()