From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 3 Mar 2013 16:08:25 +0000 (-0500)
Subject: Modernize app engine demo: py27, non-CGI interface, get_template_namespace.
X-Git-Tag: v3.0.0~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b00167b9d6933d0e1a76c6abe84823e93050bc28;p=thirdparty%2Ftornado.git

Modernize app engine demo: py27, non-CGI interface, get_template_namespace.
---

diff --git a/demos/appengine/app.yaml b/demos/appengine/app.yaml
index 2d00c586d..c90cecdba 100644
--- a/demos/appengine/app.yaml
+++ b/demos/appengine/app.yaml
@@ -1,11 +1,12 @@
 application: tornado-appengine
-version: 1
-runtime: python
+version: 2
+runtime: python27
 api_version: 1
+threadsafe: yes
 
 handlers:
 - url: /static/
   static_dir: static
 
 - url: /.*
-  script: blog.py
+  script: blog.application
diff --git a/demos/appengine/blog.py b/demos/appengine/blog.py
index 1f79bb62b..00f42316d 100644
--- a/demos/appengine/blog.py
+++ b/demos/appengine/blog.py
@@ -21,7 +21,6 @@ import re
 import tornado.web
 import tornado.wsgi
 import unicodedata
-import wsgiref.handlers
 
 from google.appengine.api import users
 from google.appengine.ext import db
@@ -67,10 +66,11 @@ class BaseHandler(tornado.web.RequestHandler):
     def get_login_url(self):
         return users.create_login_url(self.request.uri)
 
-    def render_string(self, template_name, **kwargs):
+    def get_template_namespace(self):
         # Let the templates access the users module to generate login URLs
-        return tornado.web.RequestHandler.render_string(
-            self, template_name, users=users, **kwargs)
+        ns = super(BaseHandler, self).get_template_namespace()
+        ns['users'] = users
+        return ns
 
 
 class HomeHandler(BaseHandler):
@@ -160,11 +160,3 @@ application = tornado.wsgi.WSGIApplication([
     (r"/entry/([^/]+)", EntryHandler),
     (r"/compose", ComposeHandler),
 ], **settings)
-
-
-def main():
-    wsgiref.handlers.CGIHandler().run(application)
-
-
-if __name__ == "__main__":
-    main()