diff options
| author | Chris McDonough <chrism@plope.com> | 2012-09-22 08:06:52 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-09-22 08:06:52 -0400 |
| commit | 4388d317712be00a1d49cc73ac78407fe6906263 (patch) | |
| tree | fe7669a845674848a3c65e32d988ad2527331a67 | |
| parent | d27bc7903516b8666ea814c5bb8c10de64a679f5 (diff) | |
| download | pyramid-4388d317712be00a1d49cc73ac78407fe6906263.tar.gz pyramid-4388d317712be00a1d49cc73ac78407fe6906263.tar.bz2 pyramid-4388d317712be00a1d49cc73ac78407fe6906263.zip | |
mirror john's change for chameleon, better changelog message
| -rw-r--r-- | CHANGES.txt | 5 | ||||
| -rw-r--r-- | pyramid/renderers.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 104ed1e98..4e6feb68c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,8 +4,9 @@ Next release Bug Fixes --------- -- It is now possible to use asset specifications which contain a hyphen in - Mako asset spec names. See https://github.com/Pylons/pyramid/pull/692 +- When trying to determine Mako defnames and Chameleon macro names in asset + specifications, take into account that the filename may have a hyphen in + it. See https://github.com/Pylons/pyramid/pull/692 Features -------- diff --git a/pyramid/renderers.py b/pyramid/renderers.py index 3252c2c93..1368e190e 100644 --- a/pyramid/renderers.py +++ b/pyramid/renderers.py @@ -437,7 +437,7 @@ class ChameleonRendererLookup(object): renderer = registry.queryUtility(ITemplateRenderer, name=spec) if renderer is None: p = re.compile( - r'(?P<asset>[\w_.:/]+)' + r'(?P<asset>[\w_.:/-]+)' r'(?:\#(?P<defname>[\w_]+))?' r'(\.(?P<ext>.*))' ) |