From: R David Murray <rdmurray@bitdance.com>
Date: Wed, 11 Jun 2014 20:10:10 +0000 (-0400)
Subject: #14758: Fix the fix (fix getaddrinfo in mock_socket)
X-Git-Tag: v3.5.0a1~1464
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1351ee704b1249b12987b7b2fede8742af097ded;p=python

#14758: Fix the fix (fix getaddrinfo in mock_socket)

I forgot to run all the affected tests when I fixed smtpd.
---

diff --git a/Lib/test/mock_socket.py b/Lib/test/mock_socket.py
index a4fbca6369..441e29f2ae 100644
--- a/Lib/test/mock_socket.py
+++ b/Lib/test/mock_socket.py
@@ -144,8 +144,8 @@ def gethostname():
 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 @@ error = socket_module.error
 # 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