Recommit r54805:

Add code to read from master_fd in the parent, breaking when we get an OSError
(EIO can occur on Linux) or there's no more data to read.  Without this,
test_pty.py can hang on the waitpid() because the child is blocking on the
stdout write.  This will definitely happen on Mac OS X and could potentially
happen on other platforms.  See the comment for details.
diff --git a/Misc/NEWS b/Misc/NEWS
index a089275..1d1ef10 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -17,6 +17,9 @@
 
 - tarfile.py: Fix directory names to have only one trailing slash.
 
+- Fix test_pty.py to not hang on OS X (and theoretically other *nixes) when
+  run in verbose mode.
+
 
 What's New in Python 2.5.1?
 =============================