mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-04 16:01:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source
This commit is contained in:
Guido van Rossum 2007-08-29 03:59:57 +00:00
parent 1b81e7bea5
commit 245b42ec4b
4 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/socket.py
View file

@ -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

2
Lib/ssl.py
View file

@ -1,6 +1,8 @@
# 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.

2
Lib/test/test_socket_ssl.py
View file

@ -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'):

2
Lib/test/test_ssl.py
View file

@ -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")