diff options
| author | Chris McDonough <chrism@plope.com> | 2010-11-19 22:14:18 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-11-19 22:14:18 -0500 |
| commit | ff3811e4a776f096869d860309d4cff04dcb99ba (patch) | |
| tree | 3e3806b0d9cadde44a97a777c7d27654b25cfb86 /CHANGES.txt | |
| parent | b5e5018c9b948929548615139533e9a8a504ff11 (diff) | |
| parent | 15c258849aa54eb99d272fbbef0e9c3d911d2cca (diff) | |
| download | pyramid-ff3811e4a776f096869d860309d4cff04dcb99ba.tar.gz pyramid-ff3811e4a776f096869d860309d4cff04dcb99ba.tar.bz2 pyramid-ff3811e4a776f096869d860309d4cff04dcb99ba.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CHANGES.txt')
| -rw-r--r-- | CHANGES.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index c1e89734d..ed68770fd 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,9 +7,11 @@ Features - URL Dispatch now allows for replacement markers to be located anywhere in the pattern, instead of immediately following a ``/``. -- Added ``marker_pattern`` option to ``add_route`` to supply a dict of - regular expressions to be used for markers in the pattern instead of the - default regular expression that matched everything except a ``/``. +- URL Dispatch now uses the form ``{marker}`` to denote a replace marker in + the route pattern instead of ``:marker``. The old syntax is still backwards + compatible and accepted. The new format allows a regular expression for that + marker location to be used instead of the default ``[^/]+``, for example + ``{marker:\d+}`` is now valid to require the marker to be digits. - Add a ``pyramid.url.route_path`` API, allowing folks to generate relative URLs. Calling ``route_path`` is the same as calling |