summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-05-21 18:17:57 -0400
committerChris McDonough <chrism@plope.com>2013-05-21 18:17:57 -0400
commit0fdb540f8e432061ec09623f0275a6b6555292ef (patch)
treea299dd32f92304775076be3b00cfe9d0c5f6d7d8
parent81c75fd1662b5b0a91616289dc44c808bb9be01a (diff)
downloadpyramid-0fdb540f8e432061ec09623f0275a6b6555292ef.tar.gz
pyramid-0fdb540f8e432061ec09623f0275a6b6555292ef.tar.bz2
pyramid-0fdb540f8e432061ec09623f0275a6b6555292ef.zip
tortured docs
-rw-r--r--CHANGES.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 2c4f4e31c..468fe1ed1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -32,8 +32,11 @@ Features
Bug Fixes
---------
-- ``mako_templating``: added defensive workaround for non-importability
- of ``mako`` (due to upstream ``markupsafe`` dropping Python 3.2 support).
+- ``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