[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 (test_coroutines, issue #25367)

[victor.stinner]

https://hg.python.org/cpython/rev/d8002372e5df
changeset:   98677:d8002372e5df
parent:      98674:df4ddecbc3a1
parent:      98676:d8737b841fcf
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Sun Oct 11 10:10:49 2015 +0200
summary:
  Merge 3.5 (test_coroutines, issue #25367)

files:
  Lib/test/test_coroutines.py |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py
--- a/Lib/test/test_coroutines.py
+++ b/Lib/test/test_coroutines.py
@@ -1322,7 +1322,9 @@
 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

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