From: Guido van Rossum <guido@python.org>
Date: Wed, 29 Aug 2007 03:59:57 +0000 (+0000)
Subject: Found a different, more direct way to disable ssl support until it's fixed.
X-Git-Tag: v3.0a1~153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=245b42ec4b07682dd44bb92dbde328c7ce78d90b;p=thirdparty%2FPython%2Fcpython.git

Found a different, more direct way to disable ssl support until it's fixed.
---

diff --git a/Lib/socket.py b/Lib/socket.py
index fca44ea05d2e..fb96637d74e7 100644
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -47,12 +47,12 @@ import _socket
 from _socket import *
 
 _have_ssl = False
-try:
-    import _ssl
-    from _ssl import *
-    _have_ssl = True
-except ImportError:
-    pass
+## try:
+##     import _ssl
+##     from _ssl import *
+##     _have_ssl = True
+## except ImportError:
+##     pass
 
 import os, sys, io
 
diff --git a/Lib/ssl.py b/Lib/ssl.py
index 99f625747e73..77a2ceb2fc11 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -1,6 +1,8 @@
 # Wrapper module for _ssl, providing some additional facilities
 # implemented in Python.  Written by Bill Janssen.
 
+raise ImportError("ssl.py is temporarily out of order")
+
 """\
 This module provides some more Pythonic support for SSL.
 
diff --git a/Lib/test/test_socket_ssl.py b/Lib/test/test_socket_ssl.py
index a00303878a7a..fd4383fd9fc0 100644
--- a/Lib/test/test_socket_ssl.py
+++ b/Lib/test/test_socket_ssl.py
@@ -210,8 +210,6 @@ def test_main():
     if not hasattr(socket, "ssl"):
         raise test_support.TestSkipped("socket module has no ssl support")
 
-    raise test_support.TestSkipped("Disabling this until ssl.py is fixed")
-
     tests = [BasicTests]
 
     if test_support.is_resource_enabled('network'):
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index de577286944a..35c6af994c03 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -338,8 +338,6 @@ def test_main(verbose=False):
     if skip_expected:
         raise test_support.TestSkipped("socket module has no ssl support")
 
-    raise test_support.TestSkipped("Disabling this until ssl.py is fixed")
-
     global CERTFILE
     CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir,
                             "keycert.pem")