Skip to content

Commit

Permalink
Merge pull request Pylons#3 from mmerickel/feature.pyramid-1.3-support
Browse files Browse the repository at this point in the history
Updated server to use wsgiref as per 1.3 documentation.
  • Loading branch information
mmerickel committed Dec 14, 2011
2 parents 83a8947 + 6e38b2e commit bc81751
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 20 deletions.
6 changes: 4 additions & 2 deletions humans/creatingux/step01/application.py
@@ -1,4 +1,5 @@
from paste.httpserver import serve
from wsgiref.simple_server import make_server

from pyramid.config import Configurator
from pyramid.response import Response

Expand All @@ -16,4 +17,5 @@ def main():
if __name__ == '__main__':
# When run from command line, launch a WSGI server and app
app = main()
serve(app, host='0.0.0.0')
server = make_server('0.0.0.0', 8080, app)
server.serve_forever()
6 changes: 4 additions & 2 deletions humans/creatingux/step02/application.py
@@ -1,4 +1,5 @@
from paste.httpserver import serve
from wsgiref.simple_server import make_server

from pyramid.config import Configurator
from pyramid.response import Response

Expand All @@ -13,4 +14,5 @@ def main():

if __name__ == '__main__':
app = main()
serve(app, host='0.0.0.0')
server = make_server('0.0.0.0', 8080, app)
server.serve_forever()
6 changes: 4 additions & 2 deletions humans/creatingux/step03/application.py
@@ -1,5 +1,6 @@
from wsgiref.simple_server import make_server

from pyramid.config import Configurator
from paste.httpserver import serve

def main():
config = Configurator()
Expand All @@ -9,4 +10,5 @@ def main():

if __name__ == '__main__':
app = main()
serve(app, host='0.0.0.0')
server = make_server('0.0.0.0', 8080, app)
server.serve_forever()
6 changes: 4 additions & 2 deletions humans/creatingux/step04/application.py
@@ -1,5 +1,6 @@
from wsgiref.simple_server import make_server

from pyramid.config import Configurator
from paste.httpserver import serve

def main():
config = Configurator()
Expand All @@ -9,4 +10,5 @@ def main():

if __name__ == '__main__':
app = main()
serve(app, host='0.0.0.0')
server = make_server('0.0.0.0', 8080, app)
server.serve_forever()
6 changes: 4 additions & 2 deletions humans/creatingux/step05/application.py
@@ -1,5 +1,6 @@
from wsgiref.simple_server import make_server

from pyramid.config import Configurator
from paste.httpserver import serve

def main():
config = Configurator()
Expand All @@ -9,4 +10,5 @@ def main():

if __name__ == '__main__':
app = main()
serve(app, host='0.0.0.0')
server = make_server('0.0.0.0', 8080, app)
server.serve_forever()
6 changes: 4 additions & 2 deletions humans/creatingux/step06/application.py
@@ -1,5 +1,6 @@
from wsgiref.simple_server import make_server

from pyramid.config import Configurator
from paste.httpserver import serve

def main():
config = Configurator()
Expand All @@ -9,4 +10,5 @@ def main():

if __name__ == '__main__':
app = main()
serve(app, host='0.0.0.0')
server = make_server('0.0.0.0', 8080, app)
server.serve_forever()
6 changes: 4 additions & 2 deletions humans/creatingux/step07/application.py
@@ -1,5 +1,6 @@
from wsgiref.simple_server import make_server

from pyramid.config import Configurator
from paste.httpserver import serve

def main():
config = Configurator()
Expand All @@ -9,4 +10,5 @@ def main():

if __name__ == '__main__':
app = main()
serve(app, host='0.0.0.0')
server = make_server('0.0.0.0', 8080, app)
server.serve_forever()
6 changes: 4 additions & 2 deletions humans/creatingux/step08/application.py
@@ -1,5 +1,6 @@
from wsgiref.simple_server import make_server

from pyramid.config import Configurator
from paste.httpserver import serve

def main():
config = Configurator()
Expand All @@ -11,4 +12,5 @@ def main():

if __name__ == '__main__':
app = main()
serve(app, host='0.0.0.0')
server = make_server('0.0.0.0', 8080, app)
server.serve_forever()
6 changes: 4 additions & 2 deletions humans/creatingux/step09/application.py
@@ -1,5 +1,6 @@
from wsgiref.simple_server import make_server

from pyramid.config import Configurator
from paste.httpserver import serve

def main():
config = Configurator()
Expand All @@ -11,4 +12,5 @@ def main():

if __name__ == '__main__':
app = main()
serve(app, host='0.0.0.0')
server = make_server('0.0.0.0', 8080, app)
server.serve_forever()
6 changes: 4 additions & 2 deletions humans/creatingux/step10/application.py
@@ -1,5 +1,6 @@
from wsgiref.simple_server import make_server

from pyramid.config import Configurator
from paste.httpserver import serve

def main():
config = Configurator()
Expand All @@ -11,4 +12,5 @@ def main():

if __name__ == '__main__':
app = main()
serve(app, host='0.0.0.0')
server = make_server('0.0.0.0', 8080, app)
server.serve_forever()

0 comments on commit bc81751

Please sign in to comment.