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 fca44ea05d2e4b562977bed8a23d322ee2afbe6f..fb96637d74e7eaa9643cf65d1fd540b9b725612e 100644 (file)
--- 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 99f625747e73ed40dba8662769ad9cba86154f22..77a2ceb2fc11abe7876ef3e379d4840774bbf8de 100644 (file)
--- 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 a00303878a7af870c06dd42127f9cdcf606a946f..fd4383fd9fc0e3f4904210058a0f18ddd79bd984 100644 (file)
--- 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 de577286944ad0948fdcfeec039490b366b8b26e..35c6af994c03c32817230cd34971a1d21595cd4c 100644 (file)
--- 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")