summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2015-09-14 23:14:06 +0200
committermathieui <mathieui@mathieui.net>2015-09-14 23:14:06 +0200
commit1aa15792b4cddfd77c5535ab43c6d663f33a7aed (patch)
tree395477675bdfd3f6e5be26dd6a03f0bd03f03295
parent27f98bf22c2b95b3aa39719fe7fed3db6506213a (diff)
downloadslixmpp-1aa15792b4cddfd77c5535ab43c6d663f33a7aed.tar.gz
slixmpp-1aa15792b4cddfd77c5535ab43c6d663f33a7aed.tar.bz2
slixmpp-1aa15792b4cddfd77c5535ab43c6d663f33a7aed.tar.xz
slixmpp-1aa15792b4cddfd77c5535ab43c6d663f33a7aed.zip
Bump the requirements to aiodns 1.0
(and use install_requires instead of requires in the setup.py)
-rwxr-xr-xsetup.py2
-rw-r--r--slixmpp/xmlstream/resolver.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 56fdc76e..ff5bcfb1 100755
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ setup(
platforms=['any'],
packages=packages,
ext_modules=ext_modules,
- requires=['aiodns', 'pyasn1', 'pyasn1_modules'],
+ install_requires=['aiodns>=1.0', 'pyasn1', 'pyasn1_modules'],
classifiers=CLASSIFIERS,
cmdclass={'test': TestCommand}
)
diff --git a/slixmpp/xmlstream/resolver.py b/slixmpp/xmlstream/resolver.py
index fb2c3d31..778f7dc3 100644
--- a/slixmpp/xmlstream/resolver.py
+++ b/slixmpp/xmlstream/resolver.py
@@ -193,7 +193,7 @@ def get_A(host, resolver=None, use_aiodns=True, loop=None):
except Exception as e:
log.debug('DNS: Exception while querying for %s A records: %s', host, e)
recs = []
- return recs
+ return [rec.host for rec in recs]
@asyncio.coroutine