openstack/deb-python-eventlet
Code Issues Proposed changes

Fixing testRefCountGetNameInfo

Browse Source
This commit is contained in:
Ryan Williams
2010-06-28 22:37:04 -07:00
parent 88e33c0d7b
commit 675f76dc68
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
eventlet/support/greendns.py
View File

@@ -204,9 +204,14 @@ def getnameinfo(sockaddr, flags):
""" """
try: try:
host, port = sockaddr host, port = sockaddr
except ValueError: except (ValueError, TypeError):
# must be ipv6 sockaddr, pretending we don't know how to resolve it if not isinstance(sockaddr, tuple):
raise socket.gaierror(-2, 'name or service not known') del sockaddr # to pass a stdlib test that is
# hyper-careful about reference counts
raise TypeError('getnameinfo() argument 1 must be a tuple')
else:
# must be ipv6 sockaddr, pretending we don't know how to resolve it
raise socket.gaierror(-2, 'name or service not known')
if (flags & socket.NI_NAMEREQD) and (flags & socket.NI_NUMERICHOST): if (flags & socket.NI_NAMEREQD) and (flags & socket.NI_NUMERICHOST):
# Conflicting flags. Punt. # Conflicting flags. Punt.