Bill Janssen wrote:

Here's a patch which makes test_ssl a better player in the buildbots
environment.  I deep-ended on "try-except-else" clauses.

1 files changed, 5 insertions, 4 deletions

diff --git a/Lib/ssl.py b/Lib/ssl.py
index 17a48ea..99f6257 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -100,12 +100,13 @@ class sslsocket (socket):
             # see if it's connected
             try:
                 socket.getpeername(self)
-                # yes
-                self._sslobj = _ssl.sslwrap(self._sock, 0, keyfile, certfile,
-                                            cert_reqs, ssl_version, ca_certs)
             except:
-                # no
+                # no, no connection yet
                 self._sslobj = None
+            else:
+                # yes, create the SSL object
+                self._sslobj = _ssl.sslwrap(self._sock, 0, keyfile, certfile,
+                                            cert_reqs, ssl_version, ca_certs)
         self.keyfile = keyfile
         self.certfile = certfile
         self.cert_reqs = cert_reqs