Rooba
/
tornado
mirror of https://github.com/tornadoweb/tornado.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'branch2.4' 

Conflicts:
	website/sphinx/database.rst
This commit is contained in:
Ben Darnell 2012-11-18 16:24:49 -05:00
parent 65d27e5a04 488c0d2739
commit d42de2d0ac
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
website/app.yaml
View File

@ -1,14 +1,15 @@
application: python-tornado application: python-tornado-hrd
version: 2 version: 3
runtime: python runtime: python27
api_version: 1 api_version: 1
threadsafe: yes
handlers: handlers:
- url: /static/tornado-0.1.tar.gz - url: /static/tornado-0.1.tar.gz
script: website.py script: website.application
- url: /static/tornado-0.2.tar.gz - url: /static/tornado-0.2.tar.gz
script: website.py script: website.application
- url: /static/ - url: /static/
static_dir: static static_dir: static
@ -22,10 +23,10 @@ handlers:
upload: static/favicon.ico upload: static/favicon.ico
- url: /documentation/? - url: /documentation/?
script: website.py script: website.application
- url: /documentation - url: /documentation
static_dir: sphinx/build/html static_dir: sphinx/build/html
- url: /.* - url: /.*
script: website.py script: website.application

9
website/website.py
View File

@ -18,7 +18,6 @@ import os
import os.path import os.path
import tornado.web import tornado.web
import tornado.wsgi import tornado.wsgi
import wsgiref.handlers
class ContentHandler(tornado.web.RequestHandler): class ContentHandler(tornado.web.RequestHandler):
@ -46,11 +45,3 @@ application = tornado.wsgi.WSGIApplication([
dict(url="/documentation/index.html")), dict(url="/documentation/index.html")),
], **settings) ], **settings)
def main():
wsgiref.handlers.CGIHandler().run(application)
if __name__ == "__main__":
main()