From: Bill Janssen <janssen@parc.com>
Date: Tue, 11 Sep 2007 01:09:19 +0000 (+0000)
Subject: Make sure test_ssl doesn't reference the ssl module in a
X-Git-Tag: v2.6a1~1311
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e3f1d7d059657b33e7d6fd8aea983652ccb5691f;p=thirdparty%2FPython%2Fcpython.git

Make sure test_ssl doesn't reference the ssl module in a
context where it can't be imported.
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 8254c407442f..d064790d6bf3 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -340,7 +340,10 @@ else:
     def tryProtocolCombo (server_protocol,
                           client_protocol,
                           expectedToWork,
-                          certsreqs=ssl.CERT_NONE):
+                          certsreqs=None):
+
+        if certsreqs == None:
+            certsreqs = ssl.CERT_NONE
 
         if certsreqs == ssl.CERT_NONE:
             certtype = "CERT_NONE"