mirror of https://github.com/python/cpython
Found a different, more direct way to disable ssl support until it's fixed.
This commit is contained in:
parent
1b81e7bea5
commit
245b42ec4b
|
@ -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
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
||||
|
|
|
@ -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'):
|
||||
|
|
|
@ -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")
|
||||
|
|
Loading…
Reference in New Issue