diff options
| author | Guido van Rossum <guido@python.org> | 2014-05-10 15:48:03 -0700 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2014-05-10 15:48:03 -0700 |
| commit | d6a46ae7059a5597aab614226f345bfb7dd67c16 (patch) | |
| tree | 058970efdf101cbd592f96014ee97479591a0e4a | |
| parent | a7894f7f4cff412677b3f57a89a98717e0a8f81a (diff) | |
| parent | 3d1bc608a842b375eb7921d57e417f2dfaa5b71e (diff) | |
| download | cpython-git-d6a46ae7059a5597aab614226f345bfb7dd67c16.tar.gz | |
Merge 3.4 -> default: asyncio: Upstream issue #167: remove dead code, by Marc Schlaich.
| -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 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): |