diff options
| author | Chris McDonough <chrism@plope.com> | 2011-08-10 20:52:06 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-08-10 20:52:06 -0400 |
| commit | 57144ec3a2387abc46abea1e00d36c23b25cc1b7 (patch) | |
| tree | 05c38f17b31d9738059986db481fffd3e348c137 | |
| parent | be60d7c6ed3376672bbb32ea3043f59c94c2ce11 (diff) | |
| download | pyramid-57144ec3a2387abc46abea1e00d36c23b25cc1b7.tar.gz pyramid-57144ec3a2387abc46abea1e00d36c23b25cc1b7.tar.bz2 pyramid-57144ec3a2387abc46abea1e00d36c23b25cc1b7.zip | |
trunk is 1.2dev, who are we fooling
| -rw-r--r-- | docs/narr/hooks.rst | 2 | ||||
| -rw-r--r-- | pyramid/config.py | 4 | ||||
| -rw-r--r-- | pyramid/events.py | 2 | ||||
| -rw-r--r-- | pyramid/interfaces.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst index f7ee82821..f81385c93 100644 --- a/docs/narr/hooks.rst +++ b/docs/narr/hooks.rst @@ -833,7 +833,7 @@ For full details, please read the `Venusian documentation Registering "Tweens" -------------------- -.. note:: Tweens are a feature which were added in Pyramid 1.1.1. They are +.. note:: Tweens are a feature which were added in Pyramid 1.2. They are not available in any previous version. A :term:`tween` (a contraction of the word "between") is a bit of code that diff --git a/pyramid/config.py b/pyramid/config.py index 3e91fb37a..17c0871ef 100644 --- a/pyramid/config.py +++ b/pyramid/config.py @@ -278,7 +278,7 @@ class Configurator(object): If ``route_prefix`` is passed, all routes added with :meth:`pyramid.config.Configurator.add_route` will have the specified path - prepended to their pattern. This parameter is new in Pyramid 1.x.""" + prepended to their pattern. This parameter is new in Pyramid 1.2.""" manager = manager # for testing injection venusian = venusian # for testing injection @@ -1009,7 +1009,7 @@ class Configurator(object): For more information, see :ref:`registering_tweens`. - .. note:: This feature is new as of Pyramid 1.1.1. + .. note:: This feature is new as of Pyramid 1.2. """ return self._add_tween(tween_factory, alias=alias, under=under, over=over, explicit=False) diff --git a/pyramid/events.py b/pyramid/events.py index 4021b94cc..327a339a7 100644 --- a/pyramid/events.py +++ b/pyramid/events.py @@ -197,7 +197,7 @@ class BeforeRender(dict): The event has an additional attribute named ``rendering_val``. This is the (non-system) value returned by a view or passed to ``render*`` as - ``value``. This feature is new in Pyramid 1.1.1. + ``value``. This feature is new in Pyramid 1.2. """ def __init__(self, system, rendering_val=None): diff --git a/pyramid/interfaces.py b/pyramid/interfaces.py index 7666eb020..11721d23a 100644 --- a/pyramid/interfaces.py +++ b/pyramid/interfaces.py @@ -311,7 +311,7 @@ class IBeforeRender(Interface): rendering_val = Attribute('The value returned by a view or passed to a ' '``render`` method for this rendering. ' - 'This feature is new in Pyramid 1.1.1.') + 'This feature is new in Pyramid 1.2.') class IRenderer(Interface): def __call__(value, system): @@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6): install_requires.append('simplejson') setup(name='pyramid', - version='1.1.1dev', + version='1.2dev', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, |