(original) (raw)

changeset: 91138:9b0d58b0c712 user: R David Murray rdmurray@bitdance.com date: Wed Jun 11 16:10:10 2014 -0400 files: Lib/test/mock_socket.py description: #14758: Fix the fix (fix getaddrinfo in mock_socket) I forgot to run all the affected tests when I fixed smtpd. diff -r 59e4af72a3c7 -r 9b0d58b0c712 Lib/test/mock_socket.py --- a/Lib/test/mock_socket.py Wed Jun 11 15:02:25 2014 -0500 +++ b/Lib/test/mock_socket.py Wed Jun 11 16:10:10 2014 -0400 @@ -144,8 +144,8 @@ def gethostbyname(name): return "" -def getaddrinfo(host, port): - return socket_module.getaddrinfo(host, port) +def getaddrinfo(*args, **kw): + return socket_module.getaddrinfo(*args, **kw) gaierror = socket_module.gaierror error = socket_module.error @@ -154,6 +154,6 @@ # Constants AF_INET = socket_module.AF_INET AF_INET6 = socket_module.AF_INET6 -SOCK_STREAM = None +SOCK_STREAM = socket_module.SOCK_STREAM SOL_SOCKET = None SO_REUSEADDR = None /rdmurray@bitdance.com