Fix an issue where socket.timeout errors could be handled by the wrong
exception handler in Python 2.7.