diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-10-20 05:25:14 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-10-20 05:25:14 (GMT) |
| commit | 812f6e1f234f5a601202e81c78f7b172fe9a263a (patch) | |
| tree | 1538a321ae6bbf3c9f16c13ab7b6e3ca3629e3d9 | |
| parent | 25a19247581d512b79e0f2a3e1bdaf56aaa92b6d (diff) | |
| parent | 94332cba0f0a020f35590f1c2da23a579e3e9f3a (diff) | |
| download | cpython-812f6e1f234f5a601202e81c78f7b172fe9a263a.zip cpython-812f6e1f234f5a601202e81c78f7b172fe9a263a.tar.gz cpython-812f6e1f234f5a601202e81c78f7b172fe9a263a.tar.bz2 | |
Issue #28480: Merge multithreading fixes from 3.6
| -rw-r--r-- | Lib/test/test_asyncgen.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_logging.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | 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 index 41b1b4f..c24fbea 100644 --- 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 @@ import unittest 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 index e45a982..078a86b 100644 --- a/Lib/test/test_logging.py +++ b/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) @@ -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. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 2818bed..532a6e8 100644 --- a/Modules/socketmodule.c +++ b/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) { |