summaryrefslogtreecommitdiff
path: root/docs/quick_tour.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2018-09-27 21:54:04 -0500
committerMichael Merickel <michael@merickel.org>2018-09-27 21:54:04 -0500
commit58d2a5f14bb787defefe7a2b1b36665c4991c0da (patch)
tree3eff83e38ad641e7285ce6788cad47a12fa14262 /docs/quick_tour.rst
parentf081ae991a9107363fceeeeccd361c2f85bdd046 (diff)
parent279ee00fff1894b3451d84a8eeafae42e8638776 (diff)
downloadpyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.tar.gz
pyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.tar.bz2
pyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.zip
Merge branch 'master' into fix-deprecated-accept-predicate
Diffstat (limited to 'docs/quick_tour.rst')
-rw-r--r--docs/quick_tour.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index c61cbfdfd..26195a701 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -755,14 +755,14 @@ Pyramid (for example, when a new request comes in).
Maybe you would like to log messages in your code? In your Python module,
import and set up the logging in your ``views.py``:
-.. literalinclude:: quick_tour/logging/hello_world/views.py
+.. literalinclude:: quick_tour/logging/hello_world/views/default.py
:language: python
:lineno-match:
:lines: 3-4
You can now, in your code, log messages:
-.. literalinclude:: quick_tour/logging/hello_world/views.py
+.. literalinclude:: quick_tour/logging/hello_world/views/default.py
:language: python
:lineno-match:
:lines: 7-8
@@ -819,13 +819,13 @@ Now make a "factory" and pass it to the :term:`configurator`'s
.. literalinclude:: quick_tour/sessions/hello_world/__init__.py
:language: python
:lineno-match:
- :lines: 10-13
+ :lines: 9-12
:emphasize-lines: 2-3
Pyramid's :term:`request` object now has a ``session`` attribute that we can
use in our view code in ``views.py``:
-.. literalinclude:: quick_tour/sessions/hello_world/views.py
+.. literalinclude:: quick_tour/sessions/hello_world/views/default.py
:language: python
:lineno-match:
:lines: 7-