diff options
| author | Chris McDonough <chrism@plope.com> | 2013-05-21 18:25:07 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-05-21 18:25:07 -0400 |
| commit | 91385e4c204532394d0cdee3ad61e0ff6cb51f0f (patch) | |
| tree | a299dd32f92304775076be3b00cfe9d0c5f6d7d8 /CHANGES.txt | |
| parent | dbdfb2fea3851e31e272ebbba4297a138d74e970 (diff) | |
| parent | 0fdb540f8e432061ec09623f0275a6b6555292ef (diff) | |
| download | pyramid-91385e4c204532394d0cdee3ad61e0ff6cb51f0f.tar.gz pyramid-91385e4c204532394d0cdee3ad61e0ff6cb51f0f.tar.bz2 pyramid-91385e4c204532394d0cdee3ad61e0ff6cb51f0f.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CHANGES.txt')
| -rw-r--r-- | CHANGES.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index e6dd9f0cb..468fe1ed1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -32,6 +32,12 @@ Features Bug Fixes --------- +- ``mako_templating``: added defensive workaround for non-importability of + ``mako`` due to upstream ``markupsafe`` dropping Python 3.2 support. Mako + templating will no longer work under the combination of MarkupSafe 0.17 and + Python 3.2 (although the combination of MarkupSafe 0.17 and Python 3.3 or any + supported Python 2 version will work OK). + - View lookup will now search for valid views based on the inheritance hierarchy of the context. It tries to find views based on the most specific context first, and upon predicate failure, will move up the |