[Python-checkins] cpython: Issue #21645, #21985: Remove debug code

[victor.stinner]

http://hg.python.org/cpython/rev/1ff9ce2204ee
changeset:   91688:1ff9ce2204ee
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Wed Jul 16 10:24:27 2014 +0200
summary:
  Issue #21645, #21985: Remove debug code

files:
  Lib/test/test_asyncio/test_streams.py |  50 +++++---------
  1 files changed, 17 insertions(+), 33 deletions(-)


diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py
--- a/Lib/test/test_asyncio/test_streams.py
+++ b/Lib/test/test_asyncio/test_streams.py
@@ -609,41 +609,25 @@
         rfd, wfd = os.pipe()
         args = [sys.executable, '-c', code, str(wfd)]
 
-        # FIXME: Debug code for issue #21645
-        import logging
-        self.loop.set_debug(True)
-        logger = logging.getLogger('asyncio')
-        log_level = logger.level
+        pipe = open(rfd, 'rb', 0)
+        reader = asyncio.StreamReader(loop=self.loop, limit=1)
+        protocol = asyncio.StreamReaderProtocol(reader, loop=self.loop)
+        transport, _ = self.loop.run_until_complete(
+            self.loop.connect_read_pipe(lambda: protocol, pipe))
+
+        watcher = asyncio.SafeChildWatcher()
+        watcher.attach_loop(self.loop)
         try:
-            log_handler = logging.StreamHandler(sys.__stderr__)
-            logger.addHandler(log_handler)
-            logger.setLevel(logging.DEBUG)
-            # FIXME: Debug code for issue #21645 ---
+            asyncio.set_child_watcher(watcher)
+            proc = self.loop.run_until_complete(
+                asyncio.create_subprocess_exec(*args, pass_fds={wfd}, loop=self.loop))
+            self.loop.run_until_complete(proc.wait())
+        finally:
+            asyncio.set_child_watcher(None)
 
-            pipe = open(rfd, 'rb', 0)
-            reader = asyncio.StreamReader(loop=self.loop, limit=1)
-            protocol = asyncio.StreamReaderProtocol(reader, loop=self.loop)
-            transport, _ = self.loop.run_until_complete(
-                self.loop.connect_read_pipe(lambda: protocol, pipe))
-
-            watcher = asyncio.SafeChildWatcher()
-            watcher.attach_loop(self.loop)
-            try:
-                asyncio.set_child_watcher(watcher)
-                proc = self.loop.run_until_complete(
-                    asyncio.create_subprocess_exec(*args, pass_fds={wfd}, loop=self.loop))
-                self.loop.run_until_complete(proc.wait())
-            finally:
-                asyncio.set_child_watcher(None)
-
-            os.close(wfd)
-            data = self.loop.run_until_complete(reader.read(-1))
-            self.assertEqual(data, b'data')
-        finally:
-            # FIXME: Debug code for issue #21645
-            logger.removeHandler(log_handler)
-            logger.setLevel(log_level)
-            # FIXME: Debug code for issue #21645 ---
+        os.close(wfd)
+        data = self.loop.run_until_complete(reader.read(-1))
+        self.assertEqual(data, b'data')
 
 
 if __name__ == '__main__':

-- 
Repository URL: http://hg.python.org/cpython