http://hg.python.org/cpython/rev/83e110399f3c changeset: 88844:83e110399f3c user: Victor Stinner <victor.stinner@gmail.com> date: Fri Jan 31 10:55:55 2014 +0100 summary: Issue #20452: Oops, fix debug code :-/ Add also event more debug info files: Lib/asyncio/base_events.py | 15 ++++++++++----- Lib/test/test_asyncio/test_events.py | 6 ++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -627,11 +627,16 @@ t1 = self.time() # FIXME: remove these debug info (issue #20452) dt = t1-t0 - if dt < timeout and not event_list: - print("WARNING: selector.select(timeout=%.20f) took dt=%.20f sec (dt-timeout=%+.20f)" - % (timeout, dt, dt-timeout), file=sys.__stdout__) - print("WARNING: dt+%.20f > timeout? %s" - % (self._granularity, (dt + self._granularity) > timeout), file=sys.__stdout__) + if timeout is not None: + if dt < timeout and not event_list: + print("WARNING: selector.select(timeout=%.20f) took dt=%.20f sec (dt-timeout=%+.20f)" + % (timeout, dt, dt-timeout), file=sys.__stdout__) + print("WARNING: dt+%.20f > timeout? %s" + % (self._granularity, (dt + self._granularity) > timeout), file=sys.__stdout__) + else: + if not event_list: + print("WARNING: selector.select(timeout=%r) took dt=%.20f sec" + % (timeout, dt), file=sys.__stdout__) if t1-t0 >= 1: level = logging.INFO else: diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py --- a/Lib/test/test_asyncio/test_events.py +++ b/Lib/test/test_asyncio/test_events.py @@ -1160,6 +1160,7 @@ # FIXME: remove this imports, used for debug purpose (issue #20452) import time import platform + import os def _run_once(): self.loop._run_once_counter += 1 @@ -1181,11 +1182,16 @@ self.loop.run_until_complete(wait()) calls.append(self.loop._run_once_counter) + try: + SC_CLK_TCK = os.sysconf('SC_CLK_TCK') + except Exception: + SC_CLK_TCK = None self.assertEqual(calls, [1, 3, 5, 6], # FIXME: remove these info, used for debug purpose (issue #20452) (self.loop._granularity, self.loop._selector.resolution, time.get_clock_info('monotonic'), + SC_CLK_TCK, platform.platform())) -- Repository URL: http://hg.python.org/cpython