summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-10-11 08:10:49 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-10-11 08:10:49 (GMT)
commit00a09c05ed5c2324fe94fc1f51fce748869ca935 (patch)
treea97aae4f9727509b06eed6bfb9f662258b5fdc7a
parent14b4662e18189132e343781070290bf5729452b5 (diff)
parentb45c0f7e4833615067dbe74c1e813fd1b45ce181 (diff)
downloadcpython-00a09c05ed5c2324fe94fc1f51fce748869ca935.zip
cpython-00a09c05ed5c2324fe94fc1f51fce748869ca935.tar.gz
cpython-00a09c05ed5c2324fe94fc1f51fce748869ca935.tar.bz2
Merge 3.5 (test_coroutines, issue #25367)
-rw-r--r--Lib/test/test_coroutines.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py
index 10de856..71fbe82 100644
--- a/Lib/test/test_coroutines.py
+++ b/Lib/test/test_coroutines.py
@@ -1322,7 +1322,9 @@ class CoroutineTest(unittest.TestCase):
class CoroAsyncIOCompatTest(unittest.TestCase):
def test_asyncio_1(self):
- import asyncio
+ # asyncio cannot be imported when Python is compiled without thread
+ # support
+ support.import_module('asyncio')
class MyException(Exception):
pass