From e472933e2781a5e99dd2d30b72d2a9d69ccd37a0 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Sun, 26 Aug 2007 19:35:09 +0000
Subject: 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.

---
 Lib/ssl.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'Lib/ssl.py')

diff --git a/Lib/ssl.py b/Lib/ssl.py
index 17a48ea2aa..99f625747e 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
-- 
cgit v1.2.1