summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-04-08 09:08:13 -0400
committerChris McDonough <chrism@plope.com>2014-04-08 09:08:13 -0400
commitbb9b72cf31a93479137ea7495c45bbfca7d1abb8 (patch)
tree912b74c4dc61370bb46487f5c52fc705c70e150e /docs
parentbcf18220be9c21ff4b1af50f45b90aadfa7820f5 (diff)
parentecb376a132034bd4ccfe1daa69d4828699e9028d (diff)
downloadpyramid-bb9b72cf31a93479137ea7495c45bbfca7d1abb8.tar.gz
pyramid-bb9b72cf31a93479137ea7495c45bbfca7d1abb8.tar.bz2
pyramid-bb9b72cf31a93479137ea7495c45bbfca7d1abb8.zip
Merge branch '1.5-branch'
Diffstat (limited to 'docs')
-rw-r--r--docs/quick_tutorial/hello_world.rst4
-rw-r--r--docs/quick_tutorial/hello_world/app.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/quick_tutorial/hello_world.rst b/docs/quick_tutorial/hello_world.rst
index 86e1319f0..1a9ba4c9d 100644
--- a/docs/quick_tutorial/hello_world.rst
+++ b/docs/quick_tutorial/hello_world.rst
@@ -96,13 +96,13 @@ Extra Credit
.. code-block:: python
- print ('Starting up server on http://localhost:6547')
+ print('Incoming request')
...instead of:
.. code-block:: python
- print 'Starting up server on http://localhost:6547'
+ print 'Incoming request'
#. What happens if you return a string of HTML? A sequence of integers?
diff --git a/docs/quick_tutorial/hello_world/app.py b/docs/quick_tutorial/hello_world/app.py
index 210075023..0a95f9ad3 100644
--- a/docs/quick_tutorial/hello_world/app.py
+++ b/docs/quick_tutorial/hello_world/app.py
@@ -4,7 +4,7 @@ from pyramid.response import Response
def hello_world(request):
- print ('Incoming request')
+ print('Incoming request')
return Response('<body><h1>Hello World!</h1></body>')
@@ -14,4 +14,4 @@ if __name__ == '__main__':
config.add_view(hello_world, route_name='hello')
app = config.make_wsgi_app()
server = make_server('0.0.0.0', 6543, app)
- server.serve_forever() \ No newline at end of file
+ server.serve_forever()