diff options
| author | Chris McDonough <chrism@plope.com> | 2012-08-03 15:11:54 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-08-03 15:11:54 -0400 |
| commit | 92b64cca2994774987cbce88cef89e9f71366185 (patch) | |
| tree | 12074d3509c8c549a81d0523d4967d8fae1cc05d /CHANGES.txt | |
| parent | c2000a61c0b2eb637c31b1123d2ed59a0d08acbe (diff) | |
| parent | aa62a18c7e5f39a42ca777c871cf7cf61ffd869b (diff) | |
| download | pyramid-92b64cca2994774987cbce88cef89e9f71366185.tar.gz pyramid-92b64cca2994774987cbce88cef89e9f71366185.tar.bz2 pyramid-92b64cca2994774987cbce88cef89e9f71366185.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CHANGES.txt')
| -rw-r--r-- | CHANGES.txt | 12 |
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 |