Issue #28480: Merge multithreading fixes from 3.6

Lib/test/test_asyncgen.py

@@ -1,4 +1,3 @@
-import asyncio
 import inspect
 import sys
 import types
@@ -6,6 +5,9 @@ import unittest
 
 from unittest import mock
 
+from test.support import import_module
+asyncio = import_module("asyncio")
+
 
 class AwaitException(Exception):
     pass

Lib/test/test_logging.py

@@ -4304,7 +4304,7 @@ class MiscTestCase(unittest.TestCase):
                      'logProcesses', 'currentframe',
                      'PercentStyle', 'StrFormatStyle', 'StringTemplateStyle',
                      'Filterer', 'PlaceHolder', 'Manager', 'RootLogger',
-                     'root'}
+                     'root', 'threading'}
         support.check__all__(self, logging, blacklist=blacklist)
 
 

Misc/NEWS

@@ -88,6 +88,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #28480: Fix error building socket module when multithreading is
+  disabled.
+
 - Issue #28240: timeit: remove ``-c/--clock`` and ``-t/--time`` command line
   options which were deprecated since Python 3.3.
 

Modules/socketmodule.c

@@ -664,6 +664,7 @@ internal_setblocking(PySocketSockObject *s, int block)
     result = 0;
 
   done:
+    ;  /* necessary for --without-threads flag */
     Py_END_ALLOW_THREADS
 
     if (result) {