summaryrefslogtreecommitdiff
path: root/docs/quick_tour/routing
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2016-02-21 16:10:24 -0700
committerBert JW Regeer <bertjw@regeer.org>2016-02-21 16:10:24 -0700
commit1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad (patch)
tree0db5dd6f25a9166c118c4a24d66f281f43b0aeba /docs/quick_tour/routing
parent30ae71b4a7ad97a649165374a75a70f4b64ae25c (diff)
parentaa6e5fe4f1190e6df123e3f6ccde9deb789eb344 (diff)
downloadpyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.tar.gz
pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.tar.bz2
pyramid-1c4c2bccdff38c8c7e0fefd26d65a875fd50d8ad.zip
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'docs/quick_tour/routing')
-rw-r--r--docs/quick_tour/routing/app.py2
-rw-r--r--docs/quick_tour/routing/views.py2
2 files changed, 0 insertions, 4 deletions
diff --git a/docs/quick_tour/routing/app.py b/docs/quick_tour/routing/app.py
index 04a8a6344..12b547bfe 100644
--- a/docs/quick_tour/routing/app.py
+++ b/docs/quick_tour/routing/app.py
@@ -3,9 +3,7 @@ from pyramid.config import Configurator
if __name__ == '__main__':
config = Configurator()
- # Start Route 1
config.add_route('hello', '/howdy/{first}/{last}')
- # End Route 1
config.scan('views')
app = config.make_wsgi_app()
server = make_server('0.0.0.0', 6543, app)
diff --git a/docs/quick_tour/routing/views.py b/docs/quick_tour/routing/views.py
index 8cb8d3780..8a3bd230e 100644
--- a/docs/quick_tour/routing/views.py
+++ b/docs/quick_tour/routing/views.py
@@ -2,9 +2,7 @@ from pyramid.response import Response
from pyramid.view import view_config
-# Start Route 1
@view_config(route_name='hello')
def hello_world(request):
body = '<h1>Hi %(first)s %(last)s!</h1>' % request.matchdict
return Response(body)
- # End Route 1 \ No newline at end of file