diff options
| -rw-r--r-- | CHANGES.txt | 2 | ||||
| -rw-r--r-- | docs/index.rst | 6 | ||||
| -rw-r--r-- | pyramid/mako_templating.py | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index e5340de4c..71b4fbecc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,8 @@ Next release permits the overriding of the default renderers, which was broken in 1.2a1 without a commit directly after Configurator construction. +- Mako rendering exceptions had the wrong value for an error message. + 1.2a1 (2011-08-24) ================== diff --git a/docs/index.rst b/docs/index.rst index e4a637b57..601c075fb 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -24,8 +24,8 @@ Which when saved to ``helloworld.py`` can be run by See :ref:`firstapp_chapter` for a full explanation of how this :ref:`helloworld_imperative` app works. Read the -:ref:`narrative_documentation` to understand how :app:`Pyramid` is designed -to scale from these simple beginnings to handle the largest of web +:ref:`html_narrative_documentation` to understand how :app:`Pyramid` is +designed to scale from these simple beginnings to handle the largest of web application needs. Front Matter @@ -47,7 +47,7 @@ Front Matter whatsnew-1.1 whatsnew-1.0 -.. _narrative_documentation: +.. _html_narrative_documentation: Narrative documentation ======================= diff --git a/pyramid/mako_templating.py b/pyramid/mako_templating.py index b8105c68a..5fde4e346 100644 --- a/pyramid/mako_templating.py +++ b/pyramid/mako_templating.py @@ -149,8 +149,9 @@ class MakoLookupTemplateRenderer(object): try: exc_info = sys.exc_info() errtext = exceptions.text_error_template().render( - error=exc_info[0], - traceback=exc_info[2]) + error=exc_info[1], + traceback=exc_info[2] + ) raise MakoRenderingException(errtext) finally: del exc_info |