Merge 3.4 (asyncio)

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

Lib/asyncio/base_events.py

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