Permalink
Browse files

Merge pull request #1 from niallo/master

Make this work with Pyramid 1.3 (latest)
  • Loading branch information...
2 parents 3f94ce8 + 594c634 commit 461cc613fc0710857c11b17dd945877fc6b42091 @jpetazzo committed Apr 9, 2012
Showing with 3 additions and 2 deletions.
  1. +1 −0 requirements.txt
  2. +2 −2 wsgi.py
View
@@ -1 +1,2 @@
+cherrypy
pyramid
View
@@ -1,4 +1,4 @@
-from paste.httpserver import serve
+from pyramid.scripts.pserve import cherrypy_server_runner
from pyramid.config import Configurator
from pyramid.response import Response
@@ -14,4 +14,4 @@ def dump_environ(request):
application = config.make_wsgi_app()
if __name__ == '__main__':
- serve(application, host='0.0.0.0')
+ cherrypy_server_runner(application, host='0.0.0.0')

0 comments on commit 461cc61

Please sign in to comment.