From: Ben Darnell <ben@bendarnell.com>
Date: Fri, 13 Mar 2015 22:48:31 +0000 (-0400)
Subject: Also make certifi optional on app engine.
X-Git-Tag: v4.2.0b1~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42b9e6ffe233adf079ad54a622f2cd53198cad55;p=thirdparty%2Ftornado.git

Also make certifi optional on app engine.
---

diff --git a/tornado/netutil.py b/tornado/netutil.py
index 3fde43412..9aa292c41 100644
--- a/tornado/netutil.py
+++ b/tornado/netutil.py
@@ -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