From: Brett Cannon <bcannon@gmail.com>
Date: Wed, 21 Jun 2006 16:57:57 +0000 (+0000)
Subject: At the C level, tuple arguments are passed in directly to the exception
X-Git-Tag: v2.5b2~150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70a77ac23f4a3a72ca5722d1c7f85bfd852963fa;p=python

At the C level, tuple arguments are passed in directly to the exception
constructor, meaning it is treated as *args, not as a single argument.  This
means using the 'message' attribute won't work (until Py3K comes around),
and so one must grab from 'arg' to get the error number.
---

diff --git a/Lib/test/test_socket_ssl.py b/Lib/test/test_socket_ssl.py
index fc9d09fe4b..41eab69d8f 100644
--- a/Lib/test/test_socket_ssl.py
+++ b/Lib/test/test_socket_ssl.py
@@ -56,11 +56,11 @@ def test_timeout():
     use a more reliable address.""" % (ADDR,)
         return
     except socket.error, exc:  # In case connection is refused.
-        if (isinstance(exc.message, tuple) and
-            exc.message[0] == errno.ECONNREFUSED):
-            raise test_support.TestSkipped("test socket connection refused")
+        if exc.args[0] == errno.ECONNREFUSED:
+            print "Connection refused when connecting to", ADDR
+            return
         else:
-            raise exc
+            raise
 
     ss = socket.ssl(s)
     # Read part of return welcome banner twice.