From: Guido van Rossum <guido@python.org>
Date: Sat, 10 May 2014 22:47:15 +0000 (-0700)
Subject: asyncio: Upstream issue #167: remove dead code, by Marc Schlaich.
X-Git-Tag: v3.5.0a1~1698^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d1bc608a842b375eb7921d57e417f2dfaa5b71e;p=python

asyncio: Upstream issue #167: remove dead code, by Marc Schlaich.
---

diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index d2bdc07d36..3d4a87afdb 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -775,11 +775,7 @@ class BaseEventLoop(events.AbstractEventLoop):
         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):