http://bugs.python.org/issue6267

Incorrect exception handling for xmlrp client retry

diff --git a/Lib/xmlrpclib.py b/Lib/xmlrpclib.py
index 160b61c8e041da502d1ca8c2700cb7e85955640e..da3fb5a91ccc852ba583e30c58f83dc8e238195f 100644 (file)
--- a/Lib/xmlrpclib.py
+++ b/Lib/xmlrpclib.py
@@ -1253,11 +1253,11 @@ class Transport:
         for i in (0, 1):
             try:
                 return self.single_request(host, handler, request_body, verbose)
-            except (socket.error, httplib.HTTPException), e:
-                retry = (errno.ECONNRESET,
-                         errno.ECONNABORTED,
-                         httplib.BadStatusLine) #close after we sent request
-                if i or e[0] not in retry:
+            except socket.error, e:
+                if i or e.errno not in (errno.ECONNRESET, errno.ECONNABORTED):
+                    raise
+            except http.client.BadStatusLine: #close after we sent request
+                if i:
                     raise
 
     ##