]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
GAE does not have the ssl module so we can't access ssl.CERT_REQUIRED 1379/head
authorMark Guagenti <mark.guagenti@synapse-wireless.com>
Fri, 13 Mar 2015 17:29:23 +0000 (12:29 -0500)
committerMark Guagenti <mark.guagenti@synapse-wireless.com>
Fri, 13 Mar 2015 18:01:41 +0000 (13:01 -0500)
tornado/netutil.py

index 3464255f0fe8f9a7d12ec0cf42ccabe244430420..3fde43412fdd4a2a91154964054be4266461d579 100644 (file)
@@ -79,11 +79,16 @@ if hasattr(ssl, 'SSLContext'):
             _client_ssl_defaults.options |= ssl.OP_NO_COMPRESSION
             _server_ssl_defaults.options |= ssl.OP_NO_COMPRESSION
 
-else:
+elif ssl:
     # Python 2.6-2.7.8
     _client_ssl_defaults = dict(cert_reqs=ssl.CERT_REQUIRED,
                                 ca_certs=certifi.where())
     _server_ssl_defaults = {}
+else:
+    # Google App Engine
+    _client_ssl_defaults = dict(cert_reqs=None,
+                                ca_certs=None)
+    _server_ssl_defaults = {}
 
 # ThreadedResolver runs getaddrinfo on a thread. If the hostname is unicode,
 # getaddrinfo attempts to import encodings.idna. If this is done at