summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-01-22 11:26:01 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-01-22 11:26:01 (GMT)
commit4a2dbeb0d3067aefab00ba3f43ee1939608323be (patch)
tree1388f0734fbe9fd75544ec68e277876e9b9f1238
parent462582651c92dad3d0e50810075d53d4a04e2466 (diff)
downloadcpython-4a2dbeb0d3067aefab00ba3f43ee1939608323be.zip
cpython-4a2dbeb0d3067aefab00ba3f43ee1939608323be.tar.gz
cpython-4a2dbeb0d3067aefab00ba3f43ee1939608323be.tar.bz2
asyncio: Cleanup logging in BaseEventLoop._run_once()
logger.log() is now responsible to format the timeout. It might be faster if the log is disabled for DEBUG level, but it's also more readable and fix an issue with Python 2.6 in the Trollius project.
-rw-r--r--Lib/asyncio/base_events.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index 07d49c5..72201aa 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -614,12 +614,15 @@ class BaseEventLoop(events.AbstractEventLoop):
t0 = self.time()
event_list = self._selector.select(timeout)
t1 = self.time()
- argstr = '' if timeout is None else ' {:.3f}'.format(timeout)
if t1-t0 >= 1:
level = logging.INFO
else:
level = logging.DEBUG
- logger.log(level, 'poll%s took %.3f seconds', argstr, t1-t0)
+ if timeout is not None:
+ logger.log(level, 'poll %.3f took %.3f seconds',
+ timeout, t1-t0)
+ else:
+ logger.log(level, 'poll took %.3f seconds', t1-t0)
else:
event_list = self._selector.select(timeout)
self._process_events(event_list)