mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge 3.4 (asyncio)

Browse source
This commit is contained in:
Victor Stinner 2015-01-06 01:04:38 +01:00
commit 2b014b3748
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/asyncio/__init__.py
View file

@ -18,6 +18,7 @@ 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 .coroutines import * from .coroutines import *
from .events import * from .events import *
from .futures import * from .futures import *
@ -29,7 +30,8 @@ from .subprocess import *
from .tasks import * from .tasks import *
from .transports import * from .transports import *
__all__ = (coroutines.__all__ + __all__ = (base_events.__all__ +
coroutines.__all__ +
events.__all__ + events.__all__ +
futures.__all__ + futures.__all__ +
locks.__all__ + locks.__all__ +

2
Lib/asyncio/base_events.py
View file

@ -35,7 +35,7 @@ from .coroutines import coroutine
from .log import logger from .log import logger
__all__ = ['BaseEventLoop', 'Server'] __all__ = ['BaseEventLoop']
# Argument for default thread pool executor creation. # Argument for default thread pool executor creation.