[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4 -> default: asyncio: Upstream issue #167: remove dead code, by Marc

[guido.van.rossum]

http://hg.python.org/cpython/rev/1320ad8d5222
changeset:   90620:1320ad8d5222
parent:      90618:b466dc34b86e
parent:      90619:6a4f908338a8
user:        Guido van Rossum <guido at python.org>
date:        Sat May 10 15:48:03 2014 -0700
summary:
  Merge 3.4 -> default: 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