Revert 54805 for 2.5.1 release. Can be applied after 2.5 branch is unfrozen.

diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index e69d7ea15fcdab5ebeac02300bcece3af199fab2..02290be71b98ddfbdad4beea28b7c04be753d8ce 100644 (file)
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -115,24 +115,6 @@ if pid == pty.CHILD:
     os._exit(4)
 else:
     debug("Waiting for child (%d) to finish."%pid)
-    # In verbose mode, we have to consume the debug output from the child or
-    # the child will block, causing this test to hang in the parent's
-    # waitpid() call.  The child blocks after a platform-dependent amount of
-    # data is written to its fd.  On Linux 2.6, it's 4000 bytes and the child
-    # won't block, but on OS X even the small writes in the child above will
-    # block it.  Also on Linux, the read() will throw an OSError (input/output
-    # error) when it tries to read past the end of the buffer but the child's
-    # already exited, so catch and discard those exceptions.  It's not worth
-    # checking for EIO.
-    while True:
-        try:
-            data = os.read(master_fd, 80)
-        except OSError:
-            break
-        if not data:
-            break
-        sys.stdout.write(data.replace('\r\n', '\n'))
-
     ##line = os.read(master_fd, 80)
     ##lines = line.replace('\r\n', '\n').split('\n')
     ##if False and lines != ['In child, calling os.setsid()',