[Python-checkins] cpython (merge 3.6 -> default): Issue #28480: Merge multithreading fixes from 3.6

[martin.panter]

https://hg.python.org/cpython/rev/948cf38793ce
changeset:   104578:948cf38793ce
parent:      104574:1ce50f7027c1
parent:      104577:7cb86d404866
user:        Martin Panter <vadmium+py at gmail.com>
date:        Thu Oct 20 05:25:14 2016 +0000
summary:
  Issue #28480: Merge multithreading fixes from 3.6

files:
  Lib/test/test_asyncgen.py |  4 +++-
  Lib/test/test_logging.py  |  2 +-
  Misc/NEWS                 |  3 +++
  Modules/socketmodule.c    |  1 +
  4 files changed, 8 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_asyncgen.py b/Lib/test/test_asyncgen.py
--- a/Lib/test/test_asyncgen.py
+++ b/Lib/test/test_asyncgen.py
@@ -1,4 +1,3 @@
-import asyncio
 import inspect
 import sys
 import types
@@ -6,6 +5,9 @@
 
 from unittest import mock
 
+from test.support import import_module
+asyncio = import_module("asyncio")
+
 
 class AwaitException(Exception):
     pass
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -4304,7 +4304,7 @@
                      'logProcesses', 'currentframe',
                      'PercentStyle', 'StrFormatStyle', 'StringTemplateStyle',
                      'Filterer', 'PlaceHolder', 'Manager', 'RootLogger',
-                     'root'}
+                     'root', 'threading'}
         support.check__all__(self, logging, blacklist=blacklist)
 
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -88,6 +88,9 @@
 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.
 
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -664,6 +664,7 @@
     result = 0;
 
   done:
+    ;  /* necessary for --without-threads flag */
     Py_END_ALLOW_THREADS
 
     if (result) {

-- 
Repository URL: https://hg.python.org/cpython