Skip to content

Commit 5517780

Browse files
committed
Fixed small issue and added more information about PROTOCOL_TLS
1 parent 61c50b1 commit 5517780

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

notebook/notebookapp.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,10 +1421,11 @@ def init_webapp(self):
14211421
# SSL may be missing, so only import it if it's to be used
14221422
import ssl
14231423
# PROTOCOL_TLS selects the highest ssl/tls protocol version that both the client and
1424-
# server support. When PROTOCOL_TLS is not available use PROTOCOL_SSLv23
1424+
# server support. When PROTOCOL_TLS is not available use PROTOCOL_SSLv23.
1425+
# PROTOCOL_TLS is new in version 2.7.13, 3.5.3 and 3.6
14251426
ssl_options.setdefault(
14261427
'ssl_version',
1427-
getattr('ssl', 'PROTOCOL_TLS', ssl.PROTOCOL_SSLv23)
1428+
getattr(ssl, 'PROTOCOL_TLS', ssl.PROTOCOL_SSLv23)
14281429
)
14291430
if ssl_options.get('ca_certs', False):
14301431
ssl_options.setdefault('cert_reqs', ssl.CERT_REQUIRED)

0 commit comments

Comments
 (0)