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

gvanrossum · gvanrossum · commit d6a46ae7059a · 2014-05-10T15:48:03.000-07:00
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
@@ -775,11 +775,7 @@ def _run_once(self):
         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):
