diff options
| author | Chris McDonough <chrism@plope.com> | 2012-02-26 17:05:12 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-02-26 17:05:12 -0500 |
| commit | 648c557b0327a2384d479d668ecb7c42317d892a (patch) | |
| tree | 70e47af1285f5449a230ccd3fe358687a73d5a27 | |
| parent | efde1442ca30428818309e1db7925317a6cebe49 (diff) | |
| parent | cf973d67fcae67f517d407a3f1bc3cb191def5b6 (diff) | |
| download | pyramid-648c557b0327a2384d479d668ecb7c42317d892a.tar.gz pyramid-648c557b0327a2384d479d668ecb7c42317d892a.tar.bz2 pyramid-648c557b0327a2384d479d668ecb7c42317d892a.zip | |
Merge branch '1.3-branch'
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | docs/narr/hooks.rst | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index fb2f4486a..207dbad05 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,5 @@ -Next release -============ +1.3b1 (2012-02-26) +================== Bug Fixes --------- diff --git a/docs/conf.py b/docs/conf.py index 79d9946ad..187b1a125 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -80,7 +80,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year # other places throughout the built documents. # # The short X.Y version. -version = '1.3a9' +version = '1.3b1' # The full version, including alpha/beta/rc tags. release = version diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst index b7f052b00..c44323201 100644 --- a/docs/narr/hooks.rst +++ b/docs/narr/hooks.rst @@ -776,7 +776,7 @@ as keyword arguments. def wrapper(context, request): matchdict = request.matchdict.copy() matchdict.pop('action', None) - inst = view() + inst = view(request) meth = getattr(inst, attr) return meth(**matchdict) return wrapper @@ -56,7 +56,7 @@ if not PY3: ]) setup(name='pyramid', - version='1.3a9', + version='1.3b1', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, |