root
/
flask
mirror of https://github.com/pallets/flask.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SSLContext was added in Python 2.7.9

This commit is contained in:
Briehan Lombaard 2018-05-16 14:21:19 +02:00 committed by David Lord
parent a35a97e49d
commit a913b4dafd
No known key found for this signature in database
GPG Key ID: 7A1C87E3F5BC42A8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flask/cli.py
View File

@ -670,7 +670,7 @@ class CertParamType(click.ParamType):
obj = import_string(value, silent=True) obj = import_string(value, silent=True)
if sys.version_info < (2, 7): if sys.version_info < (2, 7, 9):
if obj: if obj:
return obj return obj
else: else:
@ -687,7 +687,7 @@ def _validate_key(ctx, param, value):
cert = ctx.params.get('cert') cert = ctx.params.get('cert')
is_adhoc = cert == 'adhoc' is_adhoc = cert == 'adhoc'
if sys.version_info < (2, 7): if sys.version_info < (2, 7, 9):
is_context = cert and not isinstance(cert, (text_type, bytes)) is_context = cert and not isinstance(cert, (text_type, bytes))
else: else:
is_context = isinstance(cert, ssl.SSLContext) is_context = isinstance(cert, ssl.SSLContext)

4
tests/test_cli.py
View File

@ -521,12 +521,12 @@ def test_run_cert_import(monkeypatch):
run_command.make_context('run', ['--cert', 'not_here']) run_command.make_context('run', ['--cert', 'not_here'])
# not an SSLContext # not an SSLContext
if sys.version_info >= (2, 7): if sys.version_info >= (2, 7, 9):
with pytest.raises(click.BadParameter): with pytest.raises(click.BadParameter):
run_command.make_context('run', ['--cert', 'flask']) run_command.make_context('run', ['--cert', 'flask'])
# SSLContext # SSLContext
if sys.version_info < (2, 7): if sys.version_info < (2, 7, 9):
ssl_context = object() ssl_context = object()
else: else:
ssl_context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) ssl_context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)