diff options
| author | Chris McDonough <chrism@plope.com> | 2013-11-18 07:03:25 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-11-18 07:03:25 -0500 |
| commit | 345694c8eb6dff9ef7375374c5032e53b764c1de (patch) | |
| tree | e3a305a9ae0ac01f60ca4a362fa458720ab60f24 /docs | |
| parent | 94b754aac45e235b5b11a60489395b77c8195fdc (diff) | |
| parent | c0a6d0ef43c681a83084523c63203e50a3c8607a (diff) | |
| download | pyramid-345694c8eb6dff9ef7375374c5032e53b764c1de.tar.gz pyramid-345694c8eb6dff9ef7375374c5032e53b764c1de.tar.bz2 pyramid-345694c8eb6dff9ef7375374c5032e53b764c1de.zip | |
Merge branch '1.5-branch' of github.com:Pylons/pyramid into 1.5-branch
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/narr/commandline.rst | 12 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/src/views/tutorial/views.py | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst index 0984b4daf..3cabbd8f4 100644 --- a/docs/narr/commandline.rst +++ b/docs/narr/commandline.rst @@ -387,12 +387,12 @@ explicit tweens defined in its ``development.ini`` file: Implicit Tween Chain (not used) - Position Name Alias - -------- ---- ----- - - - INGRESS - 0 pyramid_debugtoolbar.toolbar.toolbar_tween_factory pdbt - 1 pyramid.tweens.excview_tween_factory excview - - - MAIN + Position Name + -------- ---- + - INGRESS + 0 pyramid_debugtoolbar.toolbar.toolbar_tween_factory + 1 pyramid.tweens.excview_tween_factory + - MAIN Here's the application configuration section of the ``development.ini`` used by the above ``ptweens`` command which reports that the explicit tween chain diff --git a/docs/tutorials/wiki2/src/views/tutorial/views.py b/docs/tutorials/wiki2/src/views/tutorial/views.py index 42ef77b98..b41d4ab40 100644 --- a/docs/tutorials/wiki2/src/views/tutorial/views.py +++ b/docs/tutorials/wiki2/src/views/tutorial/views.py @@ -1,3 +1,4 @@ +import cgi import re from docutils.core import publish_parts @@ -32,10 +33,10 @@ def view_page(request): exists = DBSession.query(Page).filter_by(name=word).all() if exists: view_url = request.route_url('view_page', pagename=word) - return '<a href="%s">%s</a>' % (view_url, word) + return '<a href="%s">%s</a>' % (view_url, cgi.escape(word)) else: add_url = request.route_url('add_page', pagename=word) - return '<a href="%s">%s</a>' % (add_url, word) + return '<a href="%s">%s</a>' % (add_url, cgi.escape(word)) content = publish_parts(page.data, writer_name='html')['html_body'] content = wikiwords.sub(check, content) |