]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Also make certifi optional on app engine.
authorBen Darnell <ben@bendarnell.com>
Fri, 13 Mar 2015 22:48:31 +0000 (18:48 -0400)
committerBen Darnell <ben@bendarnell.com>
Fri, 13 Mar 2015 22:48:31 +0000 (18:48 -0400)
tornado/netutil.py

index 3fde43412fdd4a2a91154964054be4266461d579..9aa292c41729d45c9dc7e046df5a3ba892d9220f 100644 (file)
@@ -39,9 +39,10 @@ try:
     import certifi
 except ImportError:
     # certifi is optional as long as we have ssl.create_default_context.
-    if not hasattr(ssl, 'create_default_context'):
+    if ssl is None or hasattr(ssl, 'create_default_context'):
+        certifi = None
+    else:
         raise
-    certifi = None
 
 try:
     xrange  # py2