diff options
| author | Guido van Rossum <guido@python.org> | 2014-05-10 22:47:15 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2014-05-10 22:47:15 (GMT) |
| commit | 3d1bc608a842b375eb7921d57e417f2dfaa5b71e (patch) | |
| tree | 35c2a509a9a9ae348a9a9620292caae8b64b477a /Lib/asyncio/base_events.py | |
| parent | 877013fe14d6e20ab917e64badec3c8aab3fac59 (diff) | |
| download | cpython-3d1bc608a842b375eb7921d57e417f2dfaa5b71e.zip cpython-3d1bc608a842b375eb7921d57e417f2dfaa5b71e.tar.gz cpython-3d1bc608a842b375eb7921d57e417f2dfaa5b71e.tar.bz2 | |
asyncio: Upstream issue #167: remove dead code, by Marc Schlaich.
Diffstat (limited to 'Lib/asyncio/base_events.py')
| -rw-r--r-- | 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 index d2bdc07..3d4a87a 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): |