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

diff --git a/demos/appengine/app.yaml b/demos/appengine/app.yaml
index 2d00c586ddf05e2c748463b6dfb289a381fbee5b..c90cecdba14e4ded858c74b0979b5ec15feb5c29 100644 (file)
--- 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 1f79bb62bf3b85a6a1ce24dcd2e1fa9f7e0d1842..00f42316df8ea89579c3011f36f26a30e3613d37 100644 (file)
--- 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()