Merge 3.4 (asyncio)

Lib/test/test_asyncio/test_base_events.py

@@ -16,10 +16,15 @@ from asyncio import constants
 from asyncio import test_utils
 try:
     from test import support
-    from test.support.script_helper import assert_python_ok
 except ImportError:
     from asyncio import test_support as support
-    from asyncio.test_support import assert_python_ok
+try:
+    from test.support.script_helper import assert_python_ok
+except ImportError:
+    try:
+        from test.script_helper import assert_python_ok
+    except ImportError:
+        from asyncio.test_support import assert_python_ok
 
 
 MOCK_ANY = mock.ANY

Lib/test/test_asyncio/test_tasks.py

@@ -15,10 +15,15 @@ from asyncio import coroutines
 from asyncio import test_utils
 try:
     from test import support
-    from test.support.script_helper import assert_python_ok
 except ImportError:
     from asyncio import test_support as support
-    from asyncio.test_support import assert_python_ok
+try:
+    from test.support.script_helper import assert_python_ok
+except ImportError:
+    try:
+        from test.script_helper import assert_python_ok
+    except ImportError:
+        from asyncio.test_support import assert_python_ok
 
 
 PY34 = (sys.version_info >= (3, 4))

Misc/NEWS

@@ -154,6 +154,8 @@ Core and Builtins
 
 - Issue #21354: PyCFunction_New function is exposed by python DLL again.
 
+- asyncio: New event loop APIs: set_task_factory() and get_task_factory()
+
 Library
 -------