summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/test/test_asyncio/test_base_events.py9
-rw-r--r--Lib/test/test_asyncio/test_tasks.py9
-rw-r--r--Misc/NEWS2
3 files changed, 16 insertions, 4 deletions
diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
index aaa8e67..fd864ce 100644
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/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
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index e47a668..5b49e76 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/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))
diff --git a/Misc/NEWS b/Misc/NEWS
index c8f66bb..76ebe1e 100644
--- a/Misc/NEWS
+++ b/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
-------