Merge 3.4 (asyncio, selectors)

This commit is contained in:
Victor Stinner 2015-01-09 21:35:03 +01:00
commit 6a825a8314
3 changed files with 3 additions and 1 deletions

View file

@ -182,6 +182,7 @@ def __repr__(self):
def connection_lost(self, exc):
self.disconnected = True
self.proc._pipe_connection_lost(self.fd, exc)
self.proc = None
def pause_writing(self):
self.proc._protocol.pause_writing()

View file

@ -405,5 +405,5 @@ def _check_cancel_other(f):
new_future.add_done_callback(_check_cancel_other)
fut.add_done_callback(
lambda future: loop.call_soon_threadsafe(
new_future._copy_state, fut))
new_future._copy_state, future))
return new_future

View file

@ -256,6 +256,7 @@ def modify(self, fileobj, events, data=None):
def close(self):
self._fd_to_key.clear()
self._map = None
def get_map(self):
return self._map