summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Halley <halley@play-bow.org>2015-10-06 07:37:41 -0700
committerBob Halley <halley@play-bow.org>2015-10-06 07:37:41 -0700
commit6ebdf8eff99e08040b43a5f443672c58a281e59f (patch)
treea761bf7b7e041ecafd973dfd1da0276aec964837
parent1b0c15086f0e5f6eacc06d77a119280c31731b3c (diff)
downloaddnspython-6ebdf8eff99e08040b43a5f443672c58a281e59f.tar.gz
In python 3, the getaddrinfo 'socktype' parameter was renamed to 'type'
-rw-r--r--dns/resolver.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/dns/resolver.py b/dns/resolver.py
index 443e1d0..df64065 100644
--- a/dns/resolver.py
+++ b/dns/resolver.py
@@ -1074,7 +1074,7 @@ _original_gethostbyname = socket.gethostbyname
_original_gethostbyname_ex = socket.gethostbyname_ex
_original_gethostbyaddr = socket.gethostbyaddr
-def _getaddrinfo(host=None, service=None, family=socket.AF_UNSPEC, socktype=0,
+def _getaddrinfo(host=None, service=None, family=socket.AF_UNSPEC, type=0,
proto=0, flags=0):
if flags & (socket.AI_ADDRCONFIG|socket.AI_V4MAPPED) != 0:
raise NotImplementedError
@@ -1150,10 +1150,10 @@ def _getaddrinfo(host=None, service=None, family=socket.AF_UNSPEC, socktype=0,
if port is None:
raise socket.gaierror(socket.EAI_NONAME)
tuples = []
- if socktype == 0:
+ if type == 0:
socktypes = [socket.SOCK_DGRAM, socket.SOCK_STREAM]
else:
- socktypes = [socktype]
+ socktypes = [type]
if flags & socket.AI_CANONNAME != 0:
cname = canonical_name
else: