From f5d4a92e66afb9ce5a85c0fc18ff76dbf4638257 Mon Sep 17 00:00:00 2001
From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 18 Nov 2012 15:27:22 -0500
Subject: [PATCH 1/3] Document the deprecation of tornado.database in the 2.4
 branch.

---
 website/sphinx/database.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/website/sphinx/database.rst b/website/sphinx/database.rst
index f6debdc9..ebdb2df3 100644
--- a/website/sphinx/database.rst
+++ b/website/sphinx/database.rst
@@ -1,5 +1,10 @@
 ``tornado.database`` --- Simple MySQL client wrapper
 ====================================================
 
+.. warning::
+   The ``tornado.database`` module is deprecated and will be removed
+   in Tornado 3.0.  It is now available separately as the
+   `torndb <https://github.com/bdarnell/torndb>`_ module.
+
 .. automodule:: tornado.database
    :members:

From 05e0a38698e68298b3503e7cdd26af90ce948c0c Mon Sep 17 00:00:00 2001
From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 18 Nov 2012 16:09:45 -0500
Subject: [PATCH 2/3] Update app engine id for HRD migration.

---
 website/app.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/app.yaml b/website/app.yaml
index 9484a911..131a6143 100644
--- a/website/app.yaml
+++ b/website/app.yaml
@@ -1,4 +1,4 @@
-application: python-tornado
+application: python-tornado-hrd
 version: 2
 runtime: python
 api_version: 1

From 488c0d27398187039ee8272313a11708427eed62 Mon Sep 17 00:00:00 2001
From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 18 Nov 2012 16:19:33 -0500
Subject: [PATCH 3/3] Upgrade appengine website to python 2.7.

---
 website/app.yaml   | 13 +++++++------
 website/website.py |  9 ---------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/website/app.yaml b/website/app.yaml
index 131a6143..f1fcfdfd 100644
--- a/website/app.yaml
+++ b/website/app.yaml
@@ -1,14 +1,15 @@
 application: python-tornado-hrd
-version: 2
-runtime: python
+version: 3
+runtime: python27
 api_version: 1
+threadsafe: yes
 
 handlers:
 - url: /static/tornado-0.1.tar.gz
-  script: website.py
+  script: website.application
 
 - url: /static/tornado-0.2.tar.gz
-  script: website.py
+  script: website.application
 
 - url: /static/
   static_dir: static
@@ -22,10 +23,10 @@ handlers:
   upload: static/favicon.ico
 
 - url: /documentation/?
-  script: website.py
+  script: website.application
 
 - url: /documentation
   static_dir: sphinx/build/html
 
 - url: /.*
-  script: website.py
+  script: website.application
diff --git a/website/website.py b/website/website.py
index 489d6aa8..2d1d8374 100644
--- a/website/website.py
+++ b/website/website.py
@@ -18,7 +18,6 @@ import os
 import os.path
 import tornado.web
 import tornado.wsgi
-import wsgiref.handlers
 
 
 class ContentHandler(tornado.web.RequestHandler):
@@ -46,11 +45,3 @@ application = tornado.wsgi.WSGIApplication([
      dict(url="/documentation/index.html")),
 
 ], **settings)
-
-
-def main():
-    wsgiref.handlers.CGIHandler().run(application)
-
-
-if __name__ == "__main__":
-    main()