diff options
| -rw-r--r-- | repoze/bfg/authentication.py | 2 | ||||
| -rw-r--r-- | repoze/bfg/chameleon_zpt.py | 2 | ||||
| -rw-r--r-- | repoze/bfg/configuration.py | 4 | ||||
| -rw-r--r-- | repoze/bfg/security.py | 2 | ||||
| -rw-r--r-- | repoze/bfg/testing.py | 14 | ||||
| -rw-r--r-- | repoze/bfg/traversal.py | 2 | ||||
| -rw-r--r-- | repoze/bfg/view.py | 4 |
7 files changed, 15 insertions, 15 deletions
diff --git a/repoze/bfg/authentication.py b/repoze/bfg/authentication.py index 6d8316206..ca8a26eec 100644 --- a/repoze/bfg/authentication.py +++ b/repoze/bfg/authentication.py @@ -221,7 +221,7 @@ class AuthTktAuthenticationPolicy(CallbackAuthenticationPolicy): while this value represents the lifetime of the cookie itself. When this value is set, the cookie's ``Max-Age`` and ``Expires`` settings will be set, allowing the auth_tkt cookie - to last between browser sessions. It is typically nonsenical + to last between browser sessions. It is typically nonsensical to set this to a value that is lower than ``timeout`` or ``reissue_time``, although it is not explicitly prevented. Optional. diff --git a/repoze/bfg/chameleon_zpt.py b/repoze/bfg/chameleon_zpt.py index 764919cc3..22d409f33 100644 --- a/repoze/bfg/chameleon_zpt.py +++ b/repoze/bfg/chameleon_zpt.py @@ -52,7 +52,7 @@ def get_renderer(path): return renderer_factory(path) def get_template(path): - """ Return the underyling object representing a :term:`Chameleon` + """ Return the underlying object representing a :term:`Chameleon` ZPT template using the template implied by the ``path`` argument. The ``path`` argument may be a package-relative path, an absolute path, or a :term:`resource specification`.""" diff --git a/repoze/bfg/configuration.py b/repoze/bfg/configuration.py index ad8da75d3..d89deb3b0 100644 --- a/repoze/bfg/configuration.py +++ b/repoze/bfg/configuration.py @@ -1302,7 +1302,7 @@ class Configurator(object): def testing_add_template(self, path, renderer=None): """Unit/integration testing helper: register a template - tenderer at ``path`` (usually a relative filename ala + renderer at ``path`` (usually a relative filename ala ``templates/foo.pt``) and return the renderer object. If the ``renderer`` argument is None, a 'dummy' renderer will be used. This function is useful when testing code that calls @@ -1798,7 +1798,7 @@ def make_app(root_factory, package=None, filename='configure.zcml', relative to the package path) that should be parsed to create the application registry. It defaults to ``configure.zcml``. It can also be a ;term:`resource specification` in the form - ``dotted_package_name:relatve/file/path.zcml``. Note that if any + ``dotted_package_name:relative/file/path.zcml``. Note that if any value for ``configure_zcml`` is passed within the ``settings`` dictionary, the value passed as ``filename`` will be ignored, replaced with the ``configure_zcml`` value. diff --git a/repoze/bfg/security.py b/repoze/bfg/security.py index e20561e80..54609bc33 100644 --- a/repoze/bfg/security.py +++ b/repoze/bfg/security.py @@ -204,7 +204,7 @@ class PermitsResult(int): class Denied(PermitsResult): """ An instance of ``Denied`` is returned when a security-related - API or other :mod:`repoze.bfg` code denies an action unlrelated to + API or other :mod:`repoze.bfg` code denies an action unrelated to an ACL check. It evaluates equal to all boolean false types. It has an attribute named ``msg`` describing the circumstances for the deny.""" diff --git a/repoze/bfg/testing.py b/repoze/bfg/testing.py index 1b7288dac..4e9abdae0 100644 --- a/repoze/bfg/testing.py +++ b/repoze/bfg/testing.py @@ -109,7 +109,7 @@ def registerEventListener(event_iface=None): .. warning:: This API is deprecated as of :mod:`repoze.bfg` 1.2. Instead use the - :meth:`repoze.bfg.configuration.Cofigurator.testing_add_subscriber` + :meth:`repoze.bfg.configuration.Configurator.testing_add_subscriber` method in your unit and integration tests. """ registry = get_current_registry() @@ -117,7 +117,7 @@ def registerEventListener(event_iface=None): return config.testing_add_subscriber(event_iface) def registerTemplateRenderer(path, renderer=None): - """ Register a template tenderer at ``path`` (usually a relative + """ Register a template renderer at ``path`` (usually a relative filename ala ``templates/foo.pt``) and return the renderer object. If the ``renderer`` argument is None, a 'dummy' renderer will be used. This function is useful when testing code that calls the @@ -226,7 +226,7 @@ def registerUtility(impl, iface=Interface, name=''): .. warning:: This API is deprecated as of :mod:`repoze.bfg` 1.2. Instead use the :meth:`repoze.bfg.Registry.registerUtility` method. The ``registry`` attribute of a :term:`Configurator` - in your unit and integration tests is an intstance of the + in your unit and integration tests is an instance of the :class:`repoze.bfg.Registry` class. """ reg = get_current_registry() @@ -256,7 +256,7 @@ def registerAdapter(impl, for_=Interface, provides=Interface, name=''): .. warning:: This API is deprecated as of :mod:`repoze.bfg` 1.2. Instead use the :meth:`repoze.bfg.Registry.registerAdapter` method. The ``registry`` attribute of a :term:`Configurator` - in your unit and integration tests is an intstance of the + in your unit and integration tests is an instance of the :class:`repoze.bfg.Registry` class. """ reg = get_current_registry() @@ -519,7 +519,7 @@ class DummyModel: ``__parent__`` arguments are passed, use these values to override the existing ``__name__`` or ``__parent__`` of the model. If any extra keyword args are passed in via the ``kw`` - aargument, use these keywords to add to or override existing + argument, use these keywords to add to or override existing model keywords (attributes).""" oldkw = self.kw.copy() oldkw.update(kw) @@ -664,7 +664,7 @@ def setUp(registry=None, request=None, hook_zca=True): .. warning:: Although this method of setting up a test registry will never disappear, after :mod:`repoze.bfg` 1.2a6, using the ``begin`` and ``end`` methods of a - ``Configurator`` are prefered to using + ``Configurator`` are preferred to using ``repoze.bfg.testing.setUp`` and ``repoze.bfg.testing.tearDown``. See :ref:`unittesting_chapter` for more information. @@ -696,7 +696,7 @@ def tearDown(unhook_zca=True): .. warning:: Although this method of tearing a test setup down will never disappear, after :mod:`repoze.bfg` 1.2a6, using the ``begin`` and ``end`` methods of a - ``Configurator`` are prefered to using + ``Configurator`` are preferred to using ``repoze.bfg.testing.setUp`` and ``repoze.bfg.testing.tearDown``. See :ref:`unittesting_chapter` for more information. diff --git a/repoze/bfg/traversal.py b/repoze/bfg/traversal.py index 8003de598..ab6eea038 100644 --- a/repoze/bfg/traversal.py +++ b/repoze/bfg/traversal.py @@ -353,7 +353,7 @@ def virtual_root(model, request): is both its own physical and virtual root). However if this API is called with a ``model`` argument which is a context obtained via URL dispatch, the model passed in will be returned - unconditonally.""" + unconditionally.""" try: reg = request.registry except AttributeError: diff --git a/repoze/bfg/view.py b/repoze/bfg/view.py index 26c7f4666..8a33e246d 100644 --- a/repoze/bfg/view.py +++ b/repoze/bfg/view.py @@ -246,7 +246,7 @@ class bfg_view(object): config.add_view(views.my_view, for_=models.MyModel, name='my_view', permission='read', 'route_name='site1') - Or might relpace the following ZCML ``view`` declaration:: + Or might replace the following ZCML ``view`` declaration:: <view for='.models.MyModel' @@ -302,7 +302,7 @@ class bfg_view(object): encountered. If the value is present, it must be a string. If the value supplied to the parameter has no ``=`` sign in it, it implies that the key must exist in the ``request.params`` - dictionary for this view to'match' the current request. If the value + dictionary for this view to 'match' the current request. If the value supplied to the parameter has a ``=`` sign in it, e.g. ``request_params="foo=123"``, then the key (``foo``) must both exist in the ``request.params`` dictionary, and the value must match the |