From f83648ef48ebe93f43e041a808e705adffbf30b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristj=C3=A1n=20Valur=20J=C3=B3nsson?= Date: Fri, 3 Jul 2009 23:26:02 +0000 Subject: [PATCH] http://bugs.python.org/issue6267 Incorrect exception handling for xmlrp client retry --- Lib/xmlrpclib.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/xmlrpclib.py b/Lib/xmlrpclib.py index 160b61c8e04..da3fb5a91cc 100644 --- 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 ##