From: Kristján Valur Jónsson <kristjan@ccpgames.com>
Date: Fri, 3 Jul 2009 23:23:50 +0000 (+0000)
Subject: http://bugs.python.org/issue6267
X-Git-Tag: v3.2a1~2892
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43535d9647921ba586b0fc8c124255300511699d;p=python

http://bugs.python.org/issue6267
Incorrect exception handling for xmlrpclient retry
---

diff --git a/Lib/xmlrpc/client.py b/Lib/xmlrpc/client.py
index 4b532efc95..9f72931ed0 100644
--- a/Lib/xmlrpc/client.py
+++ b/Lib/xmlrpc/client.py
@@ -1138,11 +1138,11 @@ class Transport:
         for i in (0, 1):
             try:
                 return self.single_request(host, handler, request_body, verbose)
-            except (socket.error, http.client.HTTPException) as e:
-                retry = (errno.ECONNRESET,
-                         errno.ECONNABORTED,
-                         http.client.BadStatusLine) #close after we sent request
-                if i or e[0] not in retry:
+            except socket.error as 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
 
     def single_request(self, host, handler, request_body, verbose=0):