From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 27 Jan 2008 18:19:04 +0000 (+0000)
Subject: Try to handle socket.errors properly in is_unavailable
X-Git-Tag: v2.6a1~361
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed444e52da16d947212afbbc200647a8c8f5b53f;p=thirdparty%2FPython%2Fcpython.git

Try to handle socket.errors properly in is_unavailable
---

diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py
index 17d7a7a134fc..70a6b39f6892 100644
--- a/Lib/test/test_xmlrpc.py
+++ b/Lib/test/test_xmlrpc.py
@@ -348,10 +348,14 @@ def is_unavailable_exception(e):
        given by operations on non-blocking sockets.'''
 
     # sometimes we get a -1 error code and/or empty headers
-    if e.errcode == -1 or e.headers is None:
-        return True
+    try:
+        if e.errcode == -1 or e.headers is None:
+            return True
+        exc_mess = e.headers.get('X-exception')
+    except AttributeError:
+        # Ignore socket.errors here.
+        exc_mess = str(e)
 
-    exc_mess = e.headers.get('X-exception')
     if exc_mess and 'temporarily unavailable' in exc_mess.lower():
         return True