bpo-32273: Move asyncio.test_utils to test.test_asyncio (#4785)

diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
index 6561a9df7790d12ba5208895501275cc519e99bf..8b08ed16634ea660bfaa688aa69f4cda9f94fed1 100644 (file)
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -14,18 +14,9 @@ from unittest import mock
 import asyncio
 from asyncio import base_events
 from asyncio import constants
-from asyncio import test_utils
-try:
-    from test import support
-except ImportError:
-    from asyncio import test_support as support
-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
+from test.test_asyncio import utils as test_utils
+from test import support
+from test.support.script_helper import assert_python_ok
 
 
 MOCK_ANY = mock.ANY

diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index 01300246fda5907390c80a2feb5692abbcf6a6bf..39d5bb54a9d64914353926da686ad3030cd3924d 100644 (file)
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -3,7 +3,6 @@
 import collections.abc
 import concurrent.futures
 import functools
-import gc
 import io
 import os
 import platform
@@ -30,8 +29,7 @@ import asyncio
 from asyncio import coroutines
 from asyncio import proactor_events
 from asyncio import selector_events
-from asyncio import sslproto
-from asyncio import test_utils
+from test.test_asyncio import utils as test_utils
 try:
     from test import support
 except ImportError:

diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py
index 4320a901f49cf63c1af73c821821efb0de7651f8..444d1df02bec434d02092f7e4a627fc043959535 100644 (file)
--- a/Lib/test/test_asyncio/test_futures.py
+++ b/Lib/test/test_asyncio/test_futures.py
@@ -9,12 +9,9 @@ import unittest
 from unittest import mock
 
 import asyncio
-from asyncio import test_utils
 from asyncio import futures
-try:
-    from test import support
-except ImportError:
-    from asyncio import test_support as support
+from test.test_asyncio import utils as test_utils
+from test import support
 
 
 def _fakefunc(f):

diff --git a/Lib/test/test_asyncio/test_locks.py b/Lib/test/test_asyncio/test_locks.py
index 78d80ecf4f3b632b254c53284ee8dbbbf2e5ee46..3c5069778b50ff94af59c4e43b4135a3399a4366 100644 (file)
--- a/Lib/test/test_asyncio/test_locks.py
+++ b/Lib/test/test_asyncio/test_locks.py
@@ -5,7 +5,7 @@ from unittest import mock
 import re
 
 import asyncio
-from asyncio import test_utils
+from test.test_asyncio import utils as test_utils
 
 STR_RGX_REPR = (
     r'^<(?P<class>.*?) object at (?P<address>.*?)'

diff --git a/Lib/test/test_asyncio/test_pep492.py b/Lib/test/test_asyncio/test_pep492.py
index 442577017d98e24358e0966b7a648fcb7291e6c0..8dd0c25e7cfed2c50eec1a506a4f3d81bfaa68e3 100644 (file)
--- a/Lib/test/test_asyncio/test_pep492.py
+++ b/Lib/test/test_asyncio/test_pep492.py
@@ -3,14 +3,11 @@
 import types
 import unittest
 
-try:
-    from test import support
-except ImportError:
-    from asyncio import test_support as support
+from test import support
 from unittest import mock
 
 import asyncio
-from asyncio import test_utils
+from test.test_asyncio import utils as test_utils
 
 
 class BaseTest(test_utils.TestCase):

diff --git a/Lib/test/test_asyncio/test_proactor_events.py b/Lib/test/test_asyncio/test_proactor_events.py
index def08b96ab0ccd1ae0e90a5c6b6fe9e8501120c6..7ccc6814b2e1866018aa16ac9767c703910802c4 100644 (file)
--- a/Lib/test/test_asyncio/test_proactor_events.py
+++ b/Lib/test/test_asyncio/test_proactor_events.py
@@ -9,7 +9,7 @@ from asyncio.proactor_events import BaseProactorEventLoop
 from asyncio.proactor_events import _ProactorSocketTransport
 from asyncio.proactor_events import _ProactorWritePipeTransport
 from asyncio.proactor_events import _ProactorDuplexPipeTransport
-from asyncio import test_utils
+from test.test_asyncio import utils as test_utils
 
 
 def close_transport(transport):

diff --git a/Lib/test/test_asyncio/test_queues.py b/Lib/test/test_asyncio/test_queues.py
index 3b66d616f8ec822e65c9e006e8e5af5bd1b1b8c3..8d78546318accbe82a863dbb264863d50407bb8e 100644 (file)
--- a/Lib/test/test_asyncio/test_queues.py
+++ b/Lib/test/test_asyncio/test_queues.py
@@ -4,7 +4,7 @@ import unittest
 from unittest import mock
 
 import asyncio
-from asyncio import test_utils
+from test.test_asyncio import utils as test_utils
 
 
 class _QueueTestBase(test_utils.TestCase):

diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py
index 616eb6f2630503dd18d2aa2a1d66b3d1528bd9ed..24feb30e3d5dd5870c46c11e17a3d708d1e46247 100644 (file)
--- a/Lib/test/test_asyncio/test_selector_events.py
+++ b/Lib/test/test_asyncio/test_selector_events.py
@@ -11,11 +11,11 @@ except ImportError:
     ssl = None
 
 import asyncio
-from asyncio import test_utils
 from asyncio.selector_events import BaseSelectorEventLoop
 from asyncio.selector_events import _SelectorTransport
 from asyncio.selector_events import _SelectorSocketTransport
 from asyncio.selector_events import _SelectorDatagramTransport
+from test.test_asyncio import utils as test_utils
 
 
 MOCK_ANY = mock.ANY

diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py
index f573ae8fe779e7f11af44eec1e2b44b022d0baa8..7650fe6bd46ca9aea4ee125216e04e38f42939d1 100644 (file)
--- a/Lib/test/test_asyncio/test_sslproto.py
+++ b/Lib/test/test_asyncio/test_sslproto.py
@@ -11,7 +11,7 @@ except ImportError:
 import asyncio
 from asyncio import log
 from asyncio import sslproto
-from asyncio import test_utils
+from test.test_asyncio import utils as test_utils
 
 
 @unittest.skipIf(ssl is None, 'No ssl module')

diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py
index 1927d731281423fc647efe6c008eed3645ebae72..7a0762cfa3bb084afcf709084608b64aa6a2dc8d 100644 (file)
--- a/Lib/test/test_asyncio/test_streams.py
+++ b/Lib/test/test_asyncio/test_streams.py
@@ -16,7 +16,7 @@ except ImportError:
     ssl = None
 
 import asyncio
-from asyncio import test_utils
+from test.test_asyncio import utils as test_utils
 
 
 class StreamReaderTests(test_utils.TestCase):

diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py
index ad4bb149559d35abf73e4910637c11c7e6f6ea08..81b08d6c292af00e66fc2105d29ab2813676bedc 100644 (file)
--- a/Lib/test/test_asyncio/test_subprocess.py
+++ b/Lib/test/test_asyncio/test_subprocess.py
@@ -7,11 +7,9 @@ from unittest import mock
 import asyncio
 from asyncio import base_subprocess
 from asyncio import subprocess
-from asyncio import test_utils
-try:
-    from test import support
-except ImportError:
-    from asyncio import test_support as support
+from test.test_asyncio import utils as test_utils
+from test import support
+
 if sys.platform != 'win32':
     from asyncio import unix_events
 

diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index cdc882a9beee0fa748f78adaf7068ec74e6f409c..071481dbc264c2454b70a255d3d5b3563936188f 100644 (file)
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -17,18 +17,9 @@ import asyncio
 from asyncio import coroutines
 from asyncio import futures
 from asyncio import tasks
-from asyncio import test_utils
-try:
-    from test import support
-except ImportError:
-    from asyncio import test_support as support
-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
+from test.test_asyncio import utils as test_utils
+from test import support
+from test.support.script_helper import assert_python_ok
 
 
 @asyncio.coroutine

diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py
index 6746b34fe2cc897bd3bf44fc1bfdfb676517ddce..e13cc3749dad7b9bf439450ed1d0f65174d809b1 100644 (file)
--- a/Lib/test/test_asyncio/test_unix_events.py
+++ b/Lib/test/test_asyncio/test_unix_events.py
@@ -21,8 +21,8 @@ if sys.platform == 'win32':
 
 import asyncio
 from asyncio import log
-from asyncio import test_utils
 from asyncio import unix_events
+from test.test_asyncio import utils as test_utils
 
 
 MOCK_ANY = mock.ANY

diff --git a/Lib/test/test_asyncio/test_windows_events.py b/Lib/test/test_asyncio/test_windows_events.py
index de6fe12061273427c28919011fc3e1c890148658..fdba636f207b2c5b67a77f73e621a378e432ee40 100644 (file)
--- a/Lib/test/test_asyncio/test_windows_events.py
+++ b/Lib/test/test_asyncio/test_windows_events.py
@@ -11,8 +11,8 @@ import _overlapped
 import _winapi
 
 import asyncio
-from asyncio import test_utils
 from asyncio import windows_events
+from test.test_asyncio import utils as test_utils
 
 
 class UpperProto(asyncio.Protocol):

diff --git a/Lib/test/test_asyncio/test_windows_utils.py b/Lib/test/test_asyncio/test_windows_utils.py
index 952f95e5730a028e230b5fbe76fa025f3a770176..9fc38586ab0023779e747d8fb91345020e528946 100644 (file)
--- a/Lib/test/test_asyncio/test_windows_utils.py
+++ b/Lib/test/test_asyncio/test_windows_utils.py
@@ -1,10 +1,8 @@
 """Tests for window_utils"""
 
-import socket
 import sys
 import unittest
 import warnings
-from unittest import mock
 
 if sys.platform != 'win32':
     raise unittest.SkipTest('Windows only')
@@ -13,10 +11,7 @@ import _overlapped
 import _winapi
 
 from asyncio import windows_utils
-try:
-    from test import support
-except ImportError:
-    from asyncio import test_support as support
+from test import support
 
 
 class PipeTests(unittest.TestCase):

diff --git a/Lib/asyncio/test_utils.py b/Lib/test/test_asyncio/utils.py
similarity index 98%
rename from Lib/asyncio/test_utils.py
rename to Lib/test/test_asyncio/utils.py
index 231916970c7fdbb2e67f5fd4561ff77244792747..560db9f562d82f2ec72efef18f9fa05d9dba485e 100644 (file)
--- a/Lib/asyncio/test_utils.py
+++ b/Lib/test/test_asyncio/utils.py
@@ -26,11 +26,11 @@ try:
 except ImportError:  # pragma: no cover
     ssl = None
 
-from . import base_events
-from . import events
-from . import futures
-from . import tasks
-from .log import logger
+from asyncio import base_events
+from asyncio import events
+from asyncio import futures
+from asyncio import tasks
+from asyncio.log import logger
 from test import support
 
 

diff --git a/Misc/NEWS.d/next/Library/2017-12-10-19-14-55.bpo-32273.5KKlCv.rst b/Misc/NEWS.d/next/Library/2017-12-10-19-14-55.bpo-32273.5KKlCv.rst
new file mode 100644 (file)
index 0000000..3bbec8f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-12-10-19-14-55.bpo-32273.5KKlCv.rst
@@ -0,0 +1 @@
+Move asyncio.test_utils to test.test_asyncio.