[Python-3000-checkins] r57646 - in python/branches/py3k/Lib: socket.py ssl.py test/test_socket_ssl.py test/test_ssl.py

[guido.van.rossum]

Author: guido.van.rossum
Date: Wed Aug 29 05:59:57 2007
New Revision: 57646

Modified:
   python/branches/py3k/Lib/socket.py
   python/branches/py3k/Lib/ssl.py
   python/branches/py3k/Lib/test/test_socket_ssl.py
   python/branches/py3k/Lib/test/test_ssl.py
Log:
Found a different, more direct way to disable ssl support until it's fixed.


Modified: python/branches/py3k/Lib/socket.py
==============================================================================
--- python/branches/py3k/Lib/socket.py	(original)
+++ python/branches/py3k/Lib/socket.py	Wed Aug 29 05:59:57 2007
@@ -47,12 +47,12 @@
 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
 

Modified: python/branches/py3k/Lib/ssl.py
==============================================================================
--- python/branches/py3k/Lib/ssl.py	(original)
+++ python/branches/py3k/Lib/ssl.py	Wed Aug 29 05:59:57 2007
@@ -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.
 

Modified: python/branches/py3k/Lib/test/test_socket_ssl.py
==============================================================================
--- python/branches/py3k/Lib/test/test_socket_ssl.py	(original)
+++ python/branches/py3k/Lib/test/test_socket_ssl.py	Wed Aug 29 05:59:57 2007
@@ -210,8 +210,6 @@
     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'):

Modified: python/branches/py3k/Lib/test/test_ssl.py
==============================================================================
--- python/branches/py3k/Lib/test/test_ssl.py	(original)
+++ python/branches/py3k/Lib/test/test_ssl.py	Wed Aug 29 05:59:57 2007
@@ -338,8 +338,6 @@
     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")