maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

cli checks for cryptography library

Browse source
This commit is contained in:
David Lord 2020-02-09 16:01:23 -08:00
parent 982663d063
commit bcde664f9a
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/flask/cli.py
View file

@ -713,10 +713,12 @@ class CertParamType(click.ParamType):
if value == "adhoc":
try:
import OpenSSL # noqa: F401
import cryptography # noqa: F401
except ImportError:
raise click.BadParameter(
"Using ad-hoc certificates requires pyOpenSSL.", ctx, param
"Using ad-hoc certificates requires the cryptography library.",
ctx,
param,
)
return value
@ -743,7 +745,7 @@ def _validate_key(ctx, param, value):
if sys.version_info < (2, 7, 9):
is_context = cert and not isinstance(cert, (text_type, bytes))
else:
is_context = isinstance(cert, ssl.SSLContext)
is_context = ssl and isinstance(cert, ssl.SSLContext)
if value is not None:
if is_adhoc: