summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-01-31 11:59:43 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-01-31 11:59:43 (GMT)
commit49d0f4e4282cbb397232c0a80799f661d2f9456f (patch)
treef4b6f8fb730f62eb45bb897cc478e53fca5747c6
parent323748e1d1f5f3239476745d0eb83db3a1d9e224 (diff)
downloadcpython-49d0f4e4282cbb397232c0a80799f661d2f9456f.zip
cpython-49d0f4e4282cbb397232c0a80799f661d2f9456f.tar.gz
cpython-49d0f4e4282cbb397232c0a80799f661d2f9456f.tar.bz2
Issue #20452: Remove debug code, no more needed
-rw-r--r--Lib/asyncio/base_events.py10
-rw-r--r--Lib/test/test_asyncio/test_events.py14
2 files changed, 2 insertions, 22 deletions
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index 168e9cb..cafd10a 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -620,18 +620,10 @@ class BaseEventLoop(events.AbstractEventLoop):
timeout = min(timeout, deadline)
# TODO: Instrumentation only in debug mode?
- # FIXME: don't force log (issue #20452)
- if True: #logger.isEnabledFor(logging.INFO):
+ if logger.isEnabledFor(logging.INFO):
t0 = self.time()
event_list = self._selector.select(timeout)
t1 = self.time()
- # FIXME: remove these debug info (issue #20452)
- dt = t1-t0
- if timeout is not None and 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 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
index f0781ab..24808cb 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -28,15 +28,6 @@ from asyncio import events
from asyncio import selector_events
from asyncio import test_utils
-# FIXME: remove these info, used for debug purpose (issue #20452)
-print("time.monotonic() info: %r" % (time.get_clock_info('monotonic'),))
-try:
- SC_CLK_TCK = os.sysconf('SC_CLK_TCK')
- print("os.sysconf('SC_CLK_TCK') = %s" % SC_CLK_TCK)
-except Exception:
- pass
-# FIXME: remove these info, used for debug purpose (issue #20452)
-
def data_file(filename):
if hasattr(support, 'TEST_HOME_DIR'):
@@ -1186,10 +1177,7 @@ class EventLoopTestsMixin:
self.loop.run_until_complete(wait())
calls.append(self.loop._run_once_counter)
- self.assertEqual(calls, [1, 3, 5, 6],
- # FIXME: remove these info, used for debug purpose (issue #20452)
- (self.loop._granularity,
- self.loop._selector.resolution))
+ self.assertEqual(calls, [1, 3, 5, 6])
class SubprocessTestsMixin: