summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorBlaise Laflamme <blaise@laflamme.org>2012-08-03 00:48:00 -0400
committerBlaise Laflamme <blaise@laflamme.org>2012-08-03 00:48:00 -0400
commit8b26752c4e54b1c9a6f8b14b14c0236be9c239b7 (patch)
tree69d6729f85f827e164f100a1d06726c79800ff0f /CHANGES.txt
parent763646c2d0ed887223d71d03a52c62679bb456fc (diff)
downloadpyramid-8b26752c4e54b1c9a6f8b14b14c0236be9c239b7.tar.gz
pyramid-8b26752c4e54b1c9a6f8b14b14c0236be9c239b7.tar.bz2
pyramid-8b26752c4e54b1c9a6f8b14b14c0236be9c239b7.zip
added entry to changes.txt for mako fix
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt12
1 files changed, 9 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index ecb2bf659..94553955c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,12 @@ Bug Fixes
during iteration`` exception. It no longer does. See
https://github.com/Pylons/pyramid/issues/635 for more information.
+- In Mako Templates lookup, check if the uri is already adjusted and bring
+ it back to an asset spec. Normally occurs with inherited templates or
+ included components.
+ https://github.com/Pylons/pyramid/issues/606
+ https://github.com/Pylons/pyramid/issues/607
+
Features
--------
@@ -50,9 +56,9 @@ Features
and ``HTTPMovedPermanently`` exceptions, so these can be caught by the
NotFound view (and other exception views).
-- The mako renderer now accepts a def name and returns the template def
- result for the view being called. The uri format using an asset spec is
- package:path/to/template#defname.mako. The old way of returning a tuple
+- The mako renderer now accepts a def name and returns the template def
+ result for the view being called. The uri format using an asset spec is
+ package:path/to/template#defname.mako. The old way of returning a tuple
from the view is supported for backward compatibility, ('defname', {}).
- When there is a predicate mismatch exception (seen when no view matches for