parent: d27bc790 | patch | commit | ignore whitespace
Chris McDonough
2012-09-22 4388d317712be00a1d49cc73ac78407fe6906263 
mirror john's change for chameleon, better changelog message
2 files modified
7 ■■■■■ changed files
CHANGES.txt 5 ●●●●● patch | view | raw | blame | history
pyramid/renderers.py 2 ●●●●● patch | view | raw | blame | history 
 CHANGES.txt


@@ -4,8 +4,9 @@


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


--------




 pyramid/renderers.py


@@ -437,7 +437,7 @@


            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>.*))'


                    )