From eae3336e425a718d6c17ee1247236a62080bac7f Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Thu, 25 Feb 2016 11:53:40 +0000 Subject: Issue #26402: Fix XML-RPC client retrying after server disconnection This is a regression introduced in 3.5 by revision eba80326ba53. Fix by Jelte Fennema, test case by me. --- Lib/xmlrpc/client.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Lib/xmlrpc/client.py') diff --git a/Lib/xmlrpc/client.py b/Lib/xmlrpc/client.py index bf42835843..e7daa0793b 100644 --- a/Lib/xmlrpc/client.py +++ b/Lib/xmlrpc/client.py @@ -1129,13 +1129,13 @@ class Transport: for i in (0, 1): try: return self.single_request(host, handler, request_body, verbose) + except http.client.RemoteDisconnected: + if i: + raise except OSError as e: if i or e.errno not in (errno.ECONNRESET, errno.ECONNABORTED, errno.EPIPE): raise - except http.client.RemoteDisconnected: - if i: - raise def single_request(self, host, handler, request_body, verbose=False): # issue XML-RPC request -- cgit v1.2.1