Commit 814ae04f authored by Victor Stinner's avatar Victor Stinner

asyncio: Don't export BaseEventLoop, BaseSelectorEventLoop nor

BaseProactorEventLoop

Import them from submodules if you really need them.
parent fd448174
...@@ -18,14 +18,11 @@ if sys.platform == 'win32': ...@@ -18,14 +18,11 @@ if sys.platform == 'win32':
import _overlapped # Will also be exported. import _overlapped # Will also be exported.
# This relies on each of the submodules having an __all__ variable. # This relies on each of the submodules having an __all__ variable.
from .base_events import *
from .events import * from .events import *
from .futures import * from .futures import *
from .locks import * from .locks import *
from .proactor_events import *
from .protocols import * from .protocols import *
from .queues import * from .queues import *
from .selector_events import *
from .streams import * from .streams import *
from .tasks import * from .tasks import *
from .transports import * from .transports import *
...@@ -36,14 +33,11 @@ else: ...@@ -36,14 +33,11 @@ else:
from .unix_events import * # pragma: no cover from .unix_events import * # pragma: no cover
__all__ = (base_events.__all__ + __all__ = (events.__all__ +
events.__all__ +
futures.__all__ + futures.__all__ +
locks.__all__ + locks.__all__ +
proactor_events.__all__ +
protocols.__all__ + protocols.__all__ +
queues.__all__ + queues.__all__ +
selector_events.__all__ +
streams.__all__ + streams.__all__ +
tasks.__all__ + tasks.__all__ +
transports.__all__) transports.__all__)
...@@ -9,6 +9,7 @@ import unittest.mock ...@@ -9,6 +9,7 @@ import unittest.mock
from test.support import find_unused_port, IPV6_ENABLED from test.support import find_unused_port, IPV6_ENABLED
import asyncio import asyncio
from asyncio import base_events
from asyncio import constants from asyncio import constants
from asyncio import test_utils from asyncio import test_utils
...@@ -16,7 +17,7 @@ from asyncio import test_utils ...@@ -16,7 +17,7 @@ from asyncio import test_utils
class BaseEventLoopTests(unittest.TestCase): class BaseEventLoopTests(unittest.TestCase):
def setUp(self): def setUp(self):
self.loop = asyncio.BaseEventLoop() self.loop = base_events.BaseEventLoop()
self.loop._selector = unittest.mock.Mock() self.loop._selector = unittest.mock.Mock()
asyncio.set_event_loop(None) asyncio.set_event_loop(None)
......
...@@ -25,6 +25,7 @@ from test import support # find_unused_port, IPV6_ENABLED, TEST_HOME_DIR ...@@ -25,6 +25,7 @@ from test import support # find_unused_port, IPV6_ENABLED, TEST_HOME_DIR
import asyncio import asyncio
from asyncio import events from asyncio import events
from asyncio import selector_events
from asyncio import test_utils from asyncio import test_utils
...@@ -902,7 +903,7 @@ class EventLoopTestsMixin: ...@@ -902,7 +903,7 @@ class EventLoopTestsMixin:
def test_internal_fds(self): def test_internal_fds(self):
loop = self.create_event_loop() loop = self.create_event_loop()
if not isinstance(loop, asyncio.BaseSelectorEventLoop): if not isinstance(loop, selector_events.BaseSelectorEventLoop):
self.skipTest('loop is not a BaseSelectorEventLoop') self.skipTest('loop is not a BaseSelectorEventLoop')
self.assertEqual(1, loop._internal_fds) self.assertEqual(1, loop._internal_fds)
......
...@@ -5,6 +5,7 @@ import unittest ...@@ -5,6 +5,7 @@ import unittest
import unittest.mock import unittest.mock
import asyncio import asyncio
from asyncio.proactor_events import BaseProactorEventLoop
from asyncio.proactor_events import _ProactorSocketTransport from asyncio.proactor_events import _ProactorSocketTransport
from asyncio.proactor_events import _ProactorWritePipeTransport from asyncio.proactor_events import _ProactorWritePipeTransport
from asyncio.proactor_events import _ProactorDuplexPipeTransport from asyncio.proactor_events import _ProactorDuplexPipeTransport
...@@ -344,18 +345,18 @@ class BaseProactorEventLoopTests(unittest.TestCase): ...@@ -344,18 +345,18 @@ class BaseProactorEventLoopTests(unittest.TestCase):
self.ssock, self.csock = unittest.mock.Mock(), unittest.mock.Mock() self.ssock, self.csock = unittest.mock.Mock(), unittest.mock.Mock()
class EventLoop(asyncio.BaseProactorEventLoop): class EventLoop(BaseProactorEventLoop):
def _socketpair(s): def _socketpair(s):
return (self.ssock, self.csock) return (self.ssock, self.csock)
self.loop = EventLoop(self.proactor) self.loop = EventLoop(self.proactor)
@unittest.mock.patch.object(asyncio.BaseProactorEventLoop, 'call_soon') @unittest.mock.patch.object(BaseProactorEventLoop, 'call_soon')
@unittest.mock.patch.object(asyncio.BaseProactorEventLoop, '_socketpair') @unittest.mock.patch.object(BaseProactorEventLoop, '_socketpair')
def test_ctor(self, socketpair, call_soon): def test_ctor(self, socketpair, call_soon):
ssock, csock = socketpair.return_value = ( ssock, csock = socketpair.return_value = (
unittest.mock.Mock(), unittest.mock.Mock()) unittest.mock.Mock(), unittest.mock.Mock())
loop = asyncio.BaseProactorEventLoop(self.proactor) loop = BaseProactorEventLoop(self.proactor)
self.assertIs(loop._ssock, ssock) self.assertIs(loop._ssock, ssock)
self.assertIs(loop._csock, csock) self.assertIs(loop._csock, csock)
self.assertEqual(loop._internal_fds, 1) self.assertEqual(loop._internal_fds, 1)
...@@ -398,7 +399,7 @@ class BaseProactorEventLoopTests(unittest.TestCase): ...@@ -398,7 +399,7 @@ class BaseProactorEventLoopTests(unittest.TestCase):
def test_socketpair(self): def test_socketpair(self):
self.assertRaises( self.assertRaises(
NotImplementedError, asyncio.BaseProactorEventLoop, self.proactor) NotImplementedError, BaseProactorEventLoop, self.proactor)
def test_make_socket_transport(self): def test_make_socket_transport(self):
tr = self.loop._make_socket_transport(self.sock, unittest.mock.Mock()) tr = self.loop._make_socket_transport(self.sock, unittest.mock.Mock())
......
...@@ -16,13 +16,14 @@ except ImportError: ...@@ -16,13 +16,14 @@ except ImportError:
import asyncio import asyncio
from asyncio import selectors from asyncio import selectors
from asyncio import test_utils from asyncio import test_utils
from asyncio.selector_events import BaseSelectorEventLoop
from asyncio.selector_events import _SelectorTransport from asyncio.selector_events import _SelectorTransport
from asyncio.selector_events import _SelectorSslTransport from asyncio.selector_events import _SelectorSslTransport
from asyncio.selector_events import _SelectorSocketTransport from asyncio.selector_events import _SelectorSocketTransport
from asyncio.selector_events import _SelectorDatagramTransport from asyncio.selector_events import _SelectorDatagramTransport
class TestBaseSelectorEventLoop(asyncio.BaseSelectorEventLoop): class TestBaseSelectorEventLoop(BaseSelectorEventLoop):
def _make_self_pipe(self): def _make_self_pipe(self):
self._ssock = unittest.mock.Mock() self._ssock = unittest.mock.Mock()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment