Permalink
Browse files

Merge branch 'branch2.4'

Conflicts:
	website/sphinx/database.rst
  • Loading branch information...
2 parents 65d27e5 + 488c0d2 commit d42de2d0ac9c2b97ec1dd83595a5b3f3de405c3c @bdarnell bdarnell committed Nov 18, 2012
Showing with 8 additions and 16 deletions.
  1. +8 −7 website/app.yaml
  2. +0 −9 website/website.py
View
@@ -1,14 +1,15 @@
-application: python-tornado
-version: 2
-runtime: python
+application: python-tornado-hrd
+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
View
@@ -18,7 +18,6 @@
import os.path
import tornado.web
import tornado.wsgi
-import wsgiref.handlers
class ContentHandler(tornado.web.RequestHandler):
@@ -46,11 +45,3 @@ def get(self, path="index"):
dict(url="/documentation/index.html")),
], **settings)
-
-
-def main():
- wsgiref.handlers.CGIHandler().run(application)
-
-
-if __name__ == "__main__":
- main()

0 comments on commit d42de2d

Please sign in to comment.