Merge branch '1.4-branch'
| | |
| | | Next release |
| | | ============ |
| | | |
| | | Bug Fixes |
| | | --------- |
| | | |
| | | - 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 |
| | | -------- |
| | | |
| | | - A new ``pyramid.session.check_csrf_token`` convenience function was added. |
| | | |
| | | - A ``check_csrf`` view predicate was added. For example, you can now do |
| | | ``config.add_view(someview, check_csrf=True)``. When the predicate is |
| | | checked, if the ``csrf_token`` value in ``request.params`` matches the CSRF |
| | | token in the request's session, the view will be permitted to execute. |
| | | Otherwise, it will not be permitted to execute. |
| | | |
| | | 1.4a1 (2012-09-16) |
| | | ================== |
| | | |
| | | Bug Fixes |
| | | --------- |
| | |
| | | # other places throughout the built documents. |
| | | # |
| | | # The short X.Y version. |
| | | version = '1.4dev' |
| | | version = '1.4a1' |
| | | |
| | | # The full version, including alpha/beta/rc tags. |
| | | release = version |
| | |
| | | html_theme = 'pyramid' |
| | | html_theme_options = dict( |
| | | github_url='https://github.com/Pylons/pyramid', |
| | | in_progress='true', |
| | | # in_progress='true', |
| | | ) |
| | | # The style sheet to use for HTML and HTML Help pages. A file of that name |
| | | # must exist either in Sphinx' static/ path, or in one of the custom paths |
| | |
| | | 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>.*))' |
| | | ) |
| | |
| | | ] |
| | | |
| | | setup(name='pyramid', |
| | | version='1.4dev', |
| | | version='1.4a1', |
| | | description=('The Pyramid web application development framework, a ' |
| | | 'Pylons project'), |
| | | long_description=README + '\n\n' + CHANGES, |