openstack/deb-python-eventlet
Code Issues Proposed changes

dns: EAI_NODATA was removed from RFC3493 and FreeBSD

Browse Source 
If your code depends on EAI_NODATA, run with EVENTLET_DEPRECATED_EAI_NODATA=yes
during transition to EAI_NONAME.
Support for EAI_NODATA will be removed in future versions.

https://github.com/eventlet/eventlet/issues/393
This commit is contained in:
Sergey Shepelev
2017-02-25 13:40:13 +03:00
parent 78f2ef8a81
commit 4e775e23f3
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
eventlet/support/greendns.py
View File

@@ -79,8 +79,14 @@ DNS_QUERY_TIMEOUT = 10.0
HOSTS_TTL = 10.0 HOSTS_TTL = 10.0
EAI_EAGAIN_ERROR = socket.gaierror(socket.EAI_AGAIN, 'Lookup timed out') EAI_EAGAIN_ERROR = socket.gaierror(socket.EAI_AGAIN, 'Lookup timed out')
EAI_NODATA_ERROR = socket.gaierror(socket.EAI_NODATA, 'No address associated with hostname')
EAI_NONAME_ERROR = socket.gaierror(socket.EAI_NONAME, 'Name or service not known') EAI_NONAME_ERROR = socket.gaierror(socket.EAI_NONAME, 'Name or service not known')
# EAI_NODATA was removed from RFC3493, it's now replaced with EAI_NONAME
# socket.EAI_NODATA is not defined on FreeBSD, probably on some other platforms too.
# https://lists.freebsd.org/pipermail/freebsd-ports/2003-October/005757.html
EAI_NODATA_ERROR = EAI_NONAME_ERROR
if (os.environ.get('EVENTLET_DEPRECATED_EAI_NODATA', '').lower() in ('1', 'y', 'yes')
and hasattr(socket, 'EAI_NODATA')):
EAI_NODATA_ERROR = socket.gaierror(socket.EAI_NODATA, 'No address associated with hostname')
def is_ipv4_addr(host): def is_ipv4_addr(host):
@@ -459,7 +465,7 @@ def _getaddrinfo_lookup(host, family, flags):
try: try:
answer = resolve(host, qfamily, False) answer = resolve(host, qfamily, False)
except socket.gaierror as e: except socket.gaierror as e:
if e.errno not in (socket.EAI_AGAIN, socket.EAI_NODATA): if e.errno not in (socket.EAI_AGAIN, EAI_NONAME_ERROR.errno, EAI_NODATA_ERROR.errno):
raise raise
err = e err = e
else: else: