traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 3.4 -> default: asyncio: Upstream issue #167: remove dead code, by Marc Schlaich.

This commit is contained in:
Guido van Rossum 2014-05-10 15:48:03 -07:00
parent a7894f7f4c 3d1bc608a8
commit d6a46ae705
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/asyncio/base_events.py
View File

@ -775,11 +775,7 @@ class BaseEventLoop(events.AbstractEventLoop):
elif self._scheduled: elif self._scheduled:
# Compute the desired timeout. # Compute the desired timeout.
when = self._scheduled[0]._when when = self._scheduled[0]._when
deadline = max(0, when - self.time()) timeout = max(0, when - self.time())
if timeout is None:
timeout = deadline
else:
timeout = min(timeout, deadline)
# TODO: Instrumentation only in debug mode? # TODO: Instrumentation only in debug mode?
if logger.isEnabledFor(logging.INFO): if logger.isEnabledFor(logging.INFO):