[Python-checkins] cpython (3.4): asyncio: Upstream issue #167: remove dead code, by Marc Schlaich.

guido.van.rossum python-checkins at python.org
Sun May 11 00:48:11 CEST 2014


http://hg.python.org/cpython/rev/6a4f908338a8
changeset:   90619:6a4f908338a8
branch:      3.4
parent:      90606:3dea57884dcd
user:        Guido van Rossum <guido at python.org>
date:        Sat May 10 15:47:15 2014 -0700
summary:
  asyncio: Upstream issue #167: remove dead code, by Marc Schlaich.

files:
  Lib/asyncio/base_events.py |  6 +-----
  1 files changed, 1 insertions(+), 5 deletions(-)


diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -775,11 +775,7 @@
         elif self._scheduled:
             # Compute the desired timeout.
             when = self._scheduled[0]._when
-            deadline = max(0, when - self.time())
-            if timeout is None:
-                timeout = deadline
-            else:
-                timeout = min(timeout, deadline)
+            timeout = max(0, when - self.time())
 
         # TODO: Instrumentation only in debug mode?
         if logger.isEnabledFor(logging.INFO):

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list