Rectify mock socket setup for Windows; add news entry

Ross Rhodes · Ross Rhodes · commit 5097ec0d700f · 2020-12-27T21:56:43.000Z
diff --git a/Lib/smtplib.py b/Lib/smtplib.py
@@ -1070,7 +1070,7 @@ def __init__(self, host='', port=LMTP_PORT, local_hostname=None,
         """Initialize a new instance."""
         super().__init__(host, port, local_hostname=local_hostname,
                          source_address=source_address, timeout=timeout)
- 
+
     def connect(self, host='localhost', port=0, source_address=None):
         """Connect to the LMTP daemon, on either a Unix or a TCP socket."""
         if host[0] != '/':
diff --git a/Lib/test/mock_socket.py b/Lib/test/mock_socket.py
@@ -155,7 +155,9 @@ def getaddrinfo(*args, **kw):
 _GLOBAL_DEFAULT_TIMEOUT = socket_module._GLOBAL_DEFAULT_TIMEOUT
 AF_INET = socket_module.AF_INET
 AF_INET6 = socket_module.AF_INET6
-AF_UNIX = socket_module.AF_UNIX
 SOCK_STREAM = socket_module.SOCK_STREAM
 SOL_SOCKET = None
 SO_REUSEADDR = None
+
+if hasattr(socket_module, 'AF_UNIX'):
+    AF_UNIX = socket_module.AF_UNIX
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
@@ -165,8 +165,10 @@ class LMTPGeneralTests(GeneralTests, unittest.TestCase):
 
     client = smtplib.LMTP
 
-    def testTimeoutDefault(self):
-        super().testTimeoutDefault()
+    def testUnixDomainSocketTimeoutDefault(self):
+        if not hasattr(socket, "AF_UNIX"):
+            self.skipTest("requires Unix domain socket")
+
         local_host = '/some/local/lmtp/delivery/program'
         mock_socket.reply_with(b"220 Hello world")
 
diff --git a/Misc/NEWS.d/next/Library/2020-12-27-21-22-01.bpo-42756.dHMPJ9.rst b/Misc/NEWS.d/next/Library/2020-12-27-21-22-01.bpo-42756.dHMPJ9.rst
@@ -0,0 +1,2 @@
+Configure LMTP Unix-domain socket to use socket global default timeout when
+a timeout is not explicitly provided.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Configure LMTP Unix-domain socket to use socket global default timeout when`
	`2`	`+a timeout is not explicitly provided.`