Commit 8b87b25d authored by Guido van Rossum's avatar Guido van Rossum

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

parent c5c5900b
...@@ -47,12 +47,12 @@ import _socket ...@@ -47,12 +47,12 @@ import _socket
from _socket import * from _socket import *
_have_ssl = False _have_ssl = False
try: ## try:
import _ssl ## import _ssl
from _ssl import * ## from _ssl import *
_have_ssl = True ## _have_ssl = True
except ImportError: ## except ImportError:
pass ## pass
import os, sys, io import os, sys, io
......
# Wrapper module for _ssl, providing some additional facilities # Wrapper module for _ssl, providing some additional facilities
# implemented in Python. Written by Bill Janssen. # 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. This module provides some more Pythonic support for SSL.
......
...@@ -210,8 +210,6 @@ def test_main(): ...@@ -210,8 +210,6 @@ def test_main():
if not hasattr(socket, "ssl"): if not hasattr(socket, "ssl"):
raise test_support.TestSkipped("socket module has no ssl support") raise test_support.TestSkipped("socket module has no ssl support")
raise test_support.TestSkipped("Disabling this until ssl.py is fixed")
tests = [BasicTests] tests = [BasicTests]
if test_support.is_resource_enabled('network'): if test_support.is_resource_enabled('network'):
......
...@@ -338,8 +338,6 @@ def test_main(verbose=False): ...@@ -338,8 +338,6 @@ def test_main(verbose=False):
if skip_expected: if skip_expected:
raise test_support.TestSkipped("socket module has no ssl support") raise test_support.TestSkipped("socket module has no ssl support")
raise test_support.TestSkipped("Disabling this until ssl.py is fixed")
global CERTFILE global CERTFILE
CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir, CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir,
"keycert.pem") "keycert.pem")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment