diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-07-18 10:47:14 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-07-18 10:47:14 (GMT) |
| commit | 457b9a689b91112d2a79707f1948bea63c430150 (patch) | |
| tree | a07f5bf9501e4ef402f274be4f08e7a365323dba /Lib | |
| parent | 75dada6af3f55443abd81473078c2a4465d0d668 (diff) | |
| parent | be0a2d767cd603046a4709c9a3fb049a3ae25bd7 (diff) | |
| download | cpython-457b9a689b91112d2a79707f1948bea63c430150.zip cpython-457b9a689b91112d2a79707f1948bea63c430150.tar.gz cpython-457b9a689b91112d2a79707f1948bea63c430150.tar.bz2 | |
(Merge 3.4) Fix asyncio.__all__: export also unix_events and windows_events
symbols
For example, on Windows, it was not possible to get ProactorEventLoop or
DefaultEventLoopPolicy using "from asyncio import *".
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/asyncio/__init__.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Lib/asyncio/__init__.py b/Lib/asyncio/__init__.py index 789424e..3911fb4 100644 --- a/Lib/asyncio/__init__.py +++ b/Lib/asyncio/__init__.py @@ -29,12 +29,6 @@ from .subprocess import * from .tasks import * from .transports import * -if sys.platform == 'win32': # pragma: no cover - from .windows_events import * -else: - from .unix_events import * # pragma: no cover - - __all__ = (coroutines.__all__ + events.__all__ + futures.__all__ + @@ -45,3 +39,10 @@ __all__ = (coroutines.__all__ + subprocess.__all__ + tasks.__all__ + transports.__all__) + +if sys.platform == 'win32': # pragma: no cover + from .windows_events import * + __all__ += windows_events.__all__ +else: + from .unix_events import * # pragma: no cover + __all__ += unix_events.__all__ |