summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio/__init__.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-06-28 22:47:28 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-06-28 22:47:28 (GMT)
commit6cdcf0d5ed565c5ec3a36331e64fbf230550543a (patch)
treef8ecb5acfd3e9b5999d3ed7bd42eefba8282f177 /Lib/asyncio/__init__.py
parent41c8da95f4ed6e08e6f904ee11ca7cef074541a9 (diff)
parentf951d28ac890063e3ecef56aa8cf851b1152d9dd (diff)
downloadcpython-6cdcf0d5ed565c5ec3a36331e64fbf230550543a.zip
cpython-6cdcf0d5ed565c5ec3a36331e64fbf230550543a.tar.gz
cpython-6cdcf0d5ed565c5ec3a36331e64fbf230550543a.tar.bz2
(Merge 3.4) asyncio: sync with Tulip, add a new asyncio.coroutines module
Diffstat (limited to 'Lib/asyncio/__init__.py')
-rw-r--r--Lib/asyncio/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/asyncio/__init__.py b/Lib/asyncio/__init__.py
index 3df2f80..789424e 100644
--- a/Lib/asyncio/__init__.py
+++ b/Lib/asyncio/__init__.py
@@ -18,6 +18,7 @@ if sys.platform == 'win32':
import _overlapped # Will also be exported.
# This relies on each of the submodules having an __all__ variable.
+from .coroutines import *
from .events import *
from .futures import *
from .locks import *
@@ -34,7 +35,8 @@ else:
from .unix_events import * # pragma: no cover
-__all__ = (events.__all__ +
+__all__ = (coroutines.__all__ +
+ events.__all__ +
futures.__all__ +
locks.__all__ +
protocols.__all__ +