Merge branch '1.4-branch'

4 files changed, 24 insertions, 4 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 66ac42136..4e6feb68c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,26 @@
 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
 ---------
diff --git a/docs/conf.py b/docs/conf.py
index 80ee0d2e5..7abae7a85 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -81,7 +81,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
 # 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
@@ -160,7 +160,7 @@ html_theme_path = ['_themes']
 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
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>.*))'
                     )
diff --git a/setup.py b/setup.py
index 03ebb4293..bb0bf45a7 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ testing_extras = tests_require + [
     ]
 
 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,