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.
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 @@
# see if it's connected
try:
socket.getpeername(self)
- # yes
+ except:
+ # 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)
- except:
- # no
- self._sslobj = None
self.keyfile = keyfile
self.certfile = certfile
self.cert_reqs = cert_reqs