The attached patch resolves the intermittent test_xmlrpc failures reported by Neal Norwitz[0]. test_xmlrpc starts the XMLRPC server with a socket timeout. This puts the socket into non-blocking mode which is incompatible with the use of socket.makefile as used by SocketServer. To work around this the test was specifically ignoring temporary read errors but the ignore was no longer working. The patch resolves this by removing the call to socket.settimeout and the code to ignore temporary read errors. I also had to change the `numrequests' parameter in FailingServerTestCase from 2->1. This test case only makes a single request per test (like the others) so numrequests=2 caused the test to hang. [0]http://mail.python.org/pipermail/python-3000/2007-October/011073.html