summaryrefslogtreecommitdiff
path: root/docs/narr/firstapp.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2012-08-23 09:57:22 -0500
committerMichael Merickel <michael@merickel.org>2012-08-23 09:57:22 -0500
commite7c4adcdd74efa5da7700e5f122c58ff17befe0f (patch)
treec7a337f2716372a55183d321ac6c21c6244cc680 /docs/narr/firstapp.rst
parente8c5618aeb8c0948bbea68e000e771d23c610d40 (diff)
parenta0243a5264371a3e69fd188cee17c6fbfd8341a8 (diff)
downloadpyramid-e7c4adcdd74efa5da7700e5f122c58ff17befe0f.tar.gz
pyramid-e7c4adcdd74efa5da7700e5f122c58ff17befe0f.tar.bz2
pyramid-e7c4adcdd74efa5da7700e5f122c58ff17befe0f.zip
Merge branch 'master' of https://github.com/virhilo/pyramid into pull.650
Diffstat (limited to 'docs/narr/firstapp.rst')
-rw-r--r--docs/narr/firstapp.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst
index a86826d86..dbdc48549 100644
--- a/docs/narr/firstapp.rst
+++ b/docs/narr/firstapp.rst
@@ -127,7 +127,7 @@ defined imports and function definitions, placed within the confines of an
.. literalinclude:: helloworld.py
:linenos:
- :lines: 8-13
+ :lines: 9-15
Let's break this down piece-by-piece.
@@ -136,7 +136,7 @@ Configurator Construction
.. literalinclude:: helloworld.py
:linenos:
- :lines: 8-9
+ :lines: 9-10
The ``if __name__ == '__main__':`` line in the code sample above represents a
Python idiom: the code inside this if clause is not invoked unless the script
@@ -169,7 +169,7 @@ Adding Configuration
.. ignore-next-block
.. literalinclude:: helloworld.py
:linenos:
- :lines: 10-11
+ :lines: 11-12
First line above calls the :meth:`pyramid.config.Configurator.add_route`
method, which registers a :term:`route` to match any URL path that begins
@@ -189,7 +189,7 @@ WSGI Application Creation
.. ignore-next-block
.. literalinclude:: helloworld.py
:linenos:
- :lines: 12
+ :lines: 13
After configuring views and ending configuration, the script creates a WSGI
*application* via the :meth:`pyramid.config.Configurator.make_wsgi_app`
@@ -218,7 +218,7 @@ WSGI Application Serving
.. ignore-next-block
.. literalinclude:: helloworld.py
:linenos:
- :lines: 13
+ :lines: 14
Finally, we actually serve the application to requestors by starting up a
WSGI server. We happen to use the :mod:`wsgiref` ``make_server`` server