diff options
| -rw-r--r-- | pyramid/config/factories.py | 7 | ||||
| -rw-r--r-- | pyramid/events.py | 2 | ||||
| -rw-r--r-- | pyramid/registry.py | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/pyramid/config/factories.py b/pyramid/config/factories.py index c8633cc47..202c3ef61 100644 --- a/pyramid/config/factories.py +++ b/pyramid/config/factories.py @@ -144,9 +144,10 @@ class FactoriesConfiguratorMixin(object): When adding a property to the request, ``callable`` can either be a callable that accepts the request as its single positional - parameter, or it can be a property descriptor. If ``name`` is - ``None``, the name of the property will be computed from the - name of the ``callable``. + parameter, or it can be a property descriptor. If ``callable`` is + a property descriptor, it has to be an instance of a class which is + a subclass of ``property``. If ``name`` is ``None``, the name of + the property will be computed from the name of the ``callable``. If the ``callable`` is a property descriptor a ``ValueError`` will be raised if ``name`` is ``None`` or ``reify`` is ``True``. diff --git a/pyramid/events.py b/pyramid/events.py index d3b068bd3..93fc127a1 100644 --- a/pyramid/events.py +++ b/pyramid/events.py @@ -225,7 +225,7 @@ class BeforeRender(dict): """ Subscribers to this event may introspect and modify the set of :term:`renderer globals` before they are passed to a :term:`renderer`. - This event object iself has a dictionary-like interface that can be used + This event object itself has a dictionary-like interface that can be used for this purpose. For example:: from pyramid.events import subscriber diff --git a/pyramid/registry.py b/pyramid/registry.py index 7589dfcac..7b75aeefc 100644 --- a/pyramid/registry.py +++ b/pyramid/registry.py @@ -12,7 +12,7 @@ from pyramid.interfaces import ( IIntrospector, IIntrospectable, ISettings, - ) +) from pyramid.path import ( CALLER_PACKAGE, |