parent: d037a9 | patch | commitdiff
Chris McDonough
2013-05-21 da8bcf5bd8920c21c8f4691a31c73eb72b7e3eab
refs
author Chris McDonough <chrism@plope.com>
Tuesday, May 21, 2013 22:05 +0200
committer Chris McDonough <chrism@plope.com>
Tuesday, May 21, 2013 22:05 +0200
commitda8bcf5bd8920c21c8f4691a31c73eb72b7e3eab
tree a6e440a79c767af099308294e6c9d66d89d20623 tree | zip | gz
parent d037a9d47b6dd8fe6da88c6a6e26ceefcfe00fc9 view | diff
45ef9a69e51189051c03b3fdeac4458ee94d7529 view | diff 
Merge pull request #1023 from Pylons/defend_against_mako_unimportable

Prevent non-3.2-compatible MarkupSafe 0.16 from breaking us.
2 files modified
32 ■■■■■ changed files
CHANGES.txt 3 ●●●●● diff | view | raw | blame | history
pyramid/mako_templating.py 29 ●●●●● diff | view | raw | blame | history