Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #474 from ppaez/wiki-documentation

Clarify two steps in the SQL wiki tutorial
  • Loading branch information...
commit 3ea3ec0de35db406ab2dd4d19f396ae5dbce88b1 2 parents b262016 + 533c89e
michr authored
View
8 docs/tutorials/wiki2/authorization.rst
@@ -189,7 +189,13 @@ visit ``/login``.
We'll need to import some stuff to service the needs of these two functions:
the ``pyramid.view.forbidden_view_config`` class, a number of values from the
``pyramid.security`` module, and a value from our newly added
-``tutorial.security`` package.
+``tutorial.security`` package. Add the following import statements to the
+head of the ``views.py`` file:
+
+.. literalinclude:: src/authorization/tutorial/views.py
+ :lines: 9-18,24-25
+ :linenos:
+ :language: python
Changing Existing Views
-----------------------
View
7 docs/tutorials/wiki2/definingviews.rst
@@ -28,15 +28,18 @@ dependency of the original "tutorial" application. The original "tutorial"
application was generated by the ``pcreate`` command; it doesn't know
about our custom application requirements. We need to add a dependency on
the ``docutils`` package to our ``tutorial`` package's ``setup.py`` file by
-assigning this dependency to the ``install_requires`` parameter in the
+assigning this dependency to the ``requires`` parameter in the
``setup`` function.
-Our resulting ``setup.py`` should look like so:
+Open ``tutorial/setup.py`` and edit it to look like the following:
.. literalinclude:: src/views/setup.py
:linenos:
+ :emphasize-lines: 17
:language: python
+(Only the highlighted line needs to be added)
+
Running ``setup.py develop``
============================
Please sign in to comment.
Something went wrong with that request. Please try again.