summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BFG_HISTORY.rst34
-rw-r--r--HISTORY.rst22
-rw-r--r--docs/designdefense.rst2
-rw-r--r--docs/narr/advanced-features.rst4
-rw-r--r--docs/narr/commandline.rst2
-rw-r--r--docs/narr/hooks.rst4
-rw-r--r--docs/narr/hybrid.rst2
-rw-r--r--docs/narr/introduction.rst2
-rw-r--r--docs/narr/security.rst2
-rw-r--r--docs/narr/upgrading.rst2
-rw-r--r--docs/narr/viewconfig.rst2
-rw-r--r--docs/quick_tour.rst2
-rw-r--r--docs/whatsnew-1.2.rst2
-rw-r--r--docs/whatsnew-1.5.rst6
-rw-r--r--src/pyramid/config/actions.py2
-rw-r--r--src/pyramid/config/tweens.py2
-rw-r--r--src/pyramid/config/views.py2
-rw-r--r--src/pyramid/httpexceptions.py4
-rw-r--r--src/pyramid/scripts/prequest.py2
-rw-r--r--src/pyramid/testing.py2
-rw-r--r--tests/test_testing.py2
21 files changed, 52 insertions, 52 deletions
diff --git a/BFG_HISTORY.rst b/BFG_HISTORY.rst
index 8a2d40920..f1e9fc312 100644
--- a/BFG_HISTORY.rst
+++ b/BFG_HISTORY.rst
@@ -390,7 +390,7 @@ Bug Fixes
- The route pattern registered internally for a local "static view"
(either via the ``static`` ZCML directive or via the
``add_static_view`` method of the configurator) was incorrect. It
- was regsistered for e.g. ``static*traverse``, while it should have
+ was registered for e.g. ``static*traverse``, while it should have
been registered for ``static/*traverse``. Symptom: two static views
could not reliably be added to a system when they both shared the
same path prefix (e.g. ``/static`` and ``/static2``).
@@ -450,7 +450,7 @@ Features
constructor argument set to the value passed to ``with_package``.
This feature will make it easier for future BFG versions to allow
dotted names as arguments in places where currently only object
- references are allowed (the work to allow dotted names isntead of
+ references are allowed (the work to allow dotted names instead of
object references everywhere has not yet been done, however).
- The new ``repoze.bfg.configuration.Configurator.maybe_dotted``
@@ -479,7 +479,7 @@ Backwards Incompatibilities
The ``request`` argument is still a keyword argument, however.
- The functions in ``repoze.bfg.renderers`` named ``render`` and
- ``render_to_response`` now accept an additonal keyword argument
+ ``render_to_response`` now accept an additional keyword argument
named ``package``.
- The ``get_renderer`` API in ``repoze.bfg.renderers`` now accepts a
@@ -516,7 +516,7 @@ Internal
- Use ``imp.get_suffixes`` indirection in
``repoze.bfg.path.package_name`` instead of hardcoded ``.py``
- ``.pyc`` and ``.pyo`` to use for comparison when attemtping to
+ ``.pyc`` and ``.pyo`` to use for comparison when attempting to
decide if a directory is a package.
- Make tests runnable again under Jython (although they do not all
@@ -1207,7 +1207,7 @@ Internal
--------
- View registrations and lookups are now done with three "requires"
- arguments instead of two to accomodate orthogonality of exception
+ arguments instead of two to accommodate orthogonality of exception
views.
- The ``repoze.bfg.interfaces.IForbiddenView`` and
@@ -1670,7 +1670,7 @@ Internal
- Remove the ``repoze.bfg.testing.registerTraverser`` function. This
function was never an API.
-Documenation
+Documentation
------------
- Doc-deprecated most helper functions in the ``repoze.bfg.testing``
@@ -1892,7 +1892,7 @@ Features
of a package nor the use of non-imperative configuration is required
to create a simple ``repoze.bfg`` application any longer.
- Imperative configuration makes ``repoze.bfg`` competetive with
+ Imperative configuration makes ``repoze.bfg`` competitive with
"microframeworks" such as `Bottle <http://bottle.paws.de/>`_ and
`Tornado <http://www.tornadoweb.org/>`_. ``repoze.bfg`` has a good
deal of functionality that most microframeworks lack, so this is
@@ -2131,7 +2131,7 @@ Internals
current ``repoze.bfg`` registry. They fall back to obtaining the
registry from the threadlocal API.
-Backwards Incompatibilites
+Backwards Incompatibilities
--------------------------
- Unit tests which use ``zope.testing.cleanup.cleanUp`` for the
@@ -2323,7 +2323,7 @@ Deprecations
the paster templates, code samples, and documentation now make
reference to ``settings`` rather than ``options``. This
change/deprecation was mainly made for purposes of clarity and
- symmetry with the ``get_settings()`` API and dicussions of
+ symmetry with the ``get_settings()`` API and discussions of
"settings" in various places in the docs: we want to use the same
name to refer to the same thing everywhere.
@@ -2866,7 +2866,7 @@ Features
e.g. ``repoze.bfg.url.route_url`` in unit tests.
- The ``notfound`` and ``forbidden`` ZCML directives now accept the
- following addtional attributes: ``attr``, ``renderer``, and
+ following additional attributes: ``attr``, ``renderer``, and
``wrapper``. These have the same meaning as they do in the context
of a ZCML ``view`` directive.
@@ -3214,7 +3214,7 @@ Features
``view_permission``. Any attribute which starts with ``view_`` can
now be spelled without the ``view_`` prefix, so ``view_for`` can be
spelled as ``for`` now, etc. Both forms are documented in the
- urldispatch narraitve documentation chapter.
+ urldispatch narrative documentation chapter.
- The ``request_param`` ZCML view directive attribute (and its
``bfg_view`` decorator cousin) can now specify both a key and a
@@ -3498,7 +3498,7 @@ Deprecations
``remoteuserauthenticationpolicy`` and
``authtktauthenticationpolicy``) and the `aclauthorizationpolicy``
authorization policy directive as described in the changes to the
- "Security" narrative documenation chapter and the wiki tutorials.
+ "Security" narrative documentation chapter and the wiki tutorials.
Features
--------
@@ -3800,7 +3800,7 @@ Backwards Incompatibilities
authentication policies named ``RepozeWho1AuthenticationPolicy``,
``RemoteUserAuthenticationPolicy``, and
``AuthTktAuthenticationPolicy`` now must accept two positional
- arguments: the orginal argument accepted by each (userid or
+ arguments: the original argument accepted by each (userid or
identity) plus a second argument, which will be the current request.
Apologies, this is required to service finding groups when there is
no "global" database connection.
@@ -3894,7 +3894,7 @@ Features
defined ``route`` statement. When it is specified, the view will
only be called when that route matches during a request.
-- It is now possible to perfom traversal *after* a route has matched.
+- It is now possible to perform traversal *after* a route has matched.
Use the pattern ``*traverse`` in a ``<route>`` ``path`` attribute
within ZCML, and the path remainder which it matches will be used as
a traversal path.
@@ -5077,7 +5077,7 @@ Backwards Incompatibilities
e.g. ``/foo /bar``. Now it returns a string, where each segment is
a UTF-8 encoded and URL-quoted element e.g. ``/foo%20/bar``. This
change was (as discussed briefly on the repoze-dev maillist)
- necessary to accomodate model objects which themselves have
+ necessary to accommodate model objects which themselves have
``__name__`` attributes that contain the ``/`` character.
For people that have no models that have high-order Unicode
@@ -5720,7 +5720,7 @@ Backwards Incompatibilities
will contain UTF-8 encoded path segments as necessary, so any URL
generated by BFG itself will be decodeable by the traverser. If another
application generates URLs to a BFG application, to be resolved
- successully, it should generate the URL with UTF-8 encoded path segments
+ successfully, it should generate the URL with UTF-8 encoded path segments
to be successfully resolved. The decoder is not at all magical: if a
non-UTF-8-decodeable path segment (e.g. one encoded using UTF-16 or some
other insanity) is passed in the URL, BFG will raise a ``TypeError`` with
@@ -5774,7 +5774,7 @@ Features
``testing.registerDummyRenderer`` is used, it instead registers a dummy
implementation using ``ITemplateRenderer`` interface, which is checked
for when the built-in templating facilities do rendering. This change
- also allows developers to make explcit named utility registrations in
+ also allows developers to make explicit named utility registrations in
the ZCML registry against ``ITemplateRenderer``; these will be found
before any on-disk template is looked up.
diff --git a/HISTORY.rst b/HISTORY.rst
index 36f1f52de..3ca751dfe 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -123,7 +123,7 @@ Bug Fixes
Deprecations
------------
-- The ``pyramid.intefaces.ISession`` interface will move to require
+- The ``pyramid.interfaces.ISession`` interface will move to require
JSON-serializable objects in Pyramid 2.0. See
"Upcoming Changes to ISession in Pyramid 2.0" in the "Sessions" chapter
of the documentation for more information about this change.
@@ -1066,7 +1066,7 @@ Bug Fixes
- ``pshell`` will now preserve the capitalization of variables in the
``[pshell]`` section of the INI file. This makes exposing classes to the
- shell a little more straightfoward.
+ shell a little more straightforward.
See https://github.com/Pylons/pyramid/pull/1883
- Fixed usage of ``pserve --monitor-restart --daemon`` which would fail in
@@ -1218,7 +1218,7 @@ Features
- ``pserve`` can now take a ``-b`` or ``--browser`` option to open the server
URL in a web browser. See https://github.com/Pylons/pyramid/pull/1533
-- Overall improvments for the ``proutes`` command. Added ``--format`` and
+- Overall improvements for the ``proutes`` command. Added ``--format`` and
``--glob`` arguments to the command, introduced the ``method``
column for displaying available request methods, and improved the ``view``
output by showing the module instead of just ``__repr__``.
@@ -1774,7 +1774,7 @@ Backwards Incompatibilities
since Pyramid 1.1. Use methods of ``request.environ`` (a real dictionary)
instead.
-- Removed ancient backwards compatibily hack in
+- Removed ancient backwards compatibility hack in
``pyramid.traversal.DefaultRootFactory`` which populated the ``__dict__`` of
the factory with the matchdict values for compatibility with BFG 0.9.
@@ -2432,7 +2432,7 @@ Features
whole-path match. It's useful when you want to always potentially show a
view when some object is traversed to, but you can't be sure about what kind
of object it will be, so you can't use the ``context`` predicate. The
- individual path elements inbetween slash characters or in tuple elements
+ individual path elements in between slash characters or in tuple elements
should be the Unicode representation of the name of the resource and should
not be encoded in any way.
@@ -2501,7 +2501,7 @@ Bug Fixes
https://github.com/Pylons/pyramid/pull/620
- Forward-port from 1.3 branch: when registering multiple views with an
- ``accept`` predicate in a Pyramid application runing under Python 3, you
+ ``accept`` predicate in a Pyramid application running under Python 3, you
might have received a ``TypeError: unorderable types: function() <
function()`` exception.
@@ -3873,7 +3873,7 @@ Backwards Incompatibilities
config.add_view('my.pkg.someview', route_name='foo')
This won't effect "normal" users, only people who have legacy BFG codebases
- that used an autommitting configurator and possibly tests that use the
+ that used an autocommitting configurator and possibly tests that use the
configurator API (the configurator returned by ``pyramid.testing.setUp`` is
an autocommitting configurator). The right way to get around this is to
use a non-autocommitting configurator (the default), which does not have
@@ -4400,7 +4400,7 @@ Documentation
- The term "template" used to refer to both "paster templates" and "rendered
templates" (templates created by a rendering engine. i.e. Mako, Chameleon,
- Jinja, etc.). "Paster templates" will now be refered to as "scaffolds",
+ Jinja, etc.). "Paster templates" will now be referred to as "scaffolds",
whereas the name for "rendered templates" will remain as "templates."
- The ``wiki`` (ZODB+Traversal) tutorial was updated slightly.
@@ -4973,7 +4973,7 @@ Backwards Incompatibilities
react to ``403 Forbidden``.
- The default value for the ``cookie_on_exception`` parameter to
- ``pyramid.session.UnencyrptedCookieSessionFactory`` is now ``True``. This
+ ``pyramid.session.UnencryptedCookieSessionFactory`` is now ``True``. This
means that when view code causes an exception to be raised, and the session
has been mutated, a cookie will be sent back in the response. Previously
its default value was ``False``.
@@ -5427,7 +5427,7 @@ Terminology Changes
Bug Fixes
---------
-- Make it possible to succesfully run all tests via ``nosetests`` command
+- Make it possible to successfully run all tests via ``nosetests`` command
directly (rather than indirectly via ``python setup.py nosetests``).
- When a configuration conflict is encountered during scanning, the conflict
@@ -5534,7 +5534,7 @@ Features
- The ``pyramid.testing.setUp`` function now accepts an ``autocommit``
keyword argument, which defaults to ``True``. If it is passed ``False``,
- the Config object returned by ``setUp`` will be a non-autocommiting Config
+ the Config object returned by ``setUp`` will be a non-autocommitting Config
object.
- Add logging configuration to all paster templates.
diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index 566ad1f5e..e02949ce5 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -988,7 +988,7 @@ the following:
traverses by registering one or more adapters. As a result of being able
to either replace the larger component entirely or turn knobs on the
default implementation of the larger component, no one understands when (or
- whether) they should ever override the larger component entrirely. This
+ whether) they should ever override the larger component entirely. This
results, over time, in a rusting together of the larger "replaceable"
component and the framework itself because people come to depend on the
availability of the default component in order just to turn its knobs. The
diff --git a/docs/narr/advanced-features.rst b/docs/narr/advanced-features.rst
index b169aad95..b24208bc4 100644
--- a/docs/narr/advanced-features.rst
+++ b/docs/narr/advanced-features.rst
@@ -84,7 +84,7 @@ Speaking of the :app:`Pyramid` structured :meth:`~pyramid.config.Configurator.in
If you need, you can extend or override the configuration of an existing application by including its configuration in your own and then modifying it.
-For example, if you want to reuse an existing application that already has a bunch of routes, you can just use the ``include`` statement with a ``route_prefix``. All the routes of that application will be availabe, prefixed as you requested:
+For example, if you want to reuse an existing application that already has a bunch of routes, you can just use the ``include`` statement with a ``route_prefix``. All the routes of that application will be available, prefixed as you requested:
.. code-block:: python
:linenos:
@@ -115,7 +115,7 @@ In addition, the system that handles authentication and authorization is flexibl
Build Trees of Resources
------------------------
-:app:`Pyramid` supports :term:`traversal`, a way of mapping URLs to a concrete :term:`resource tree`. If your application naturally consists of an arbitrary heirarchy of different types of content (like a CMS or a Document Management System), traversal is for you. If you have a requirement for a highly granular security model ("Jane can edit documents in *this* folder, but not *that* one"), traversal can be a powerful approach.
+:app:`Pyramid` supports :term:`traversal`, a way of mapping URLs to a concrete :term:`resource tree`. If your application naturally consists of an arbitrary hierarchy of different types of content (like a CMS or a Document Management System), traversal is for you. If you have a requirement for a highly granular security model ("Jane can edit documents in *this* folder, but not *that* one"), traversal can be a powerful approach.
.. seealso::
diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst
index 21b2a0839..0c5189903 100644
--- a/docs/narr/commandline.rst
+++ b/docs/narr/commandline.rst
@@ -452,7 +452,7 @@ For example:
route_and_view_attached / app1.standard_views.route_and_view_attached *
method_conflicts /conflicts app1.standard_conflicts <route mismatch>
multiview /multiview app1.standard_views.multiview GET,PATCH
- not_post /not_post app1.standard_views.multview !POST,*
+ not_post /not_post app1.standard_views.multiview !POST,*
``proutes`` generates a table with four columns: *Name*, *Pattern*, *View*, and
*Method*. The items listed in the Name column are route names, the items
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index 3c02c2653..1ca5c3a6d 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -1335,7 +1335,7 @@ Specifying neither ``over`` nor ``under`` is equivalent to specifying
If all options for ``under`` (or ``over``) cannot be found in the current
configuration, it is an error. If some options are specified purely for
-compatibilty with other tweens, just add a fallback of ``MAIN`` or ``INGRESS``.
+compatibility with other tweens, just add a fallback of ``MAIN`` or ``INGRESS``.
For example, ``under=('someothertween', 'someothertween2', INGRESS)``. This
constraint will require the tween to be located under the ``someothertween``
tween, the ``someothertween2`` tween, and ``INGRESS``. If any of these is not
@@ -1412,7 +1412,7 @@ time.
Displaying Tween Ordering
~~~~~~~~~~~~~~~~~~~~~~~~~
-The ``ptweens`` command-line utility can be used to report the current implict
+The ``ptweens`` command-line utility can be used to report the current implicit
and explicit tween chains used by an application. See
:ref:`displaying_tweens`.
diff --git a/docs/narr/hybrid.rst b/docs/narr/hybrid.rst
index 1238601ed..58c3e82e8 100644
--- a/docs/narr/hybrid.rst
+++ b/docs/narr/hybrid.rst
@@ -495,7 +495,7 @@ the above call to ``request.resource_path`` would generate ``/mysection/``. See
:ref:`virtual_root_support` for more information.
If the route you're trying to use needs simple dynamic part values to be filled
-in to succesfully generate the URL, you can pass these as the ``route_kw``
+in to successfully generate the URL, you can pass these as the ``route_kw``
argument to ``resource_url`` and ``resource_path``. For example, assuming that
the route definition is like so:
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 41a5638e3..b32013931 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -245,7 +245,7 @@ When you use a :term:`renderer` with your view callable, you are freed from need
.. index::
pair: renderer; explicitly calling
- pair: view renderer; explictly calling
+ pair: view renderer; explicitly calling
.. _example_render_to_response_call:
diff --git a/docs/narr/security.rst b/docs/narr/security.rst
index 6b6f9a1f1..94469ba48 100644
--- a/docs/narr/security.rst
+++ b/docs/narr/security.rst
@@ -772,7 +772,7 @@ Preventing Cross-Site Request Forgery Attacks
`Cross-site request forgery
<https://en.wikipedia.org/wiki/Cross-site_request_forgery>`_ attacks are a
-phenomenon whereby a user who is logged in to your website might inadvertantly
+phenomenon whereby a user who is logged in to your website might inadvertently
load a URL because it is linked from, or embedded in, an attacker's website.
If the URL is one that may modify or delete data, the consequences can be dire.
diff --git a/docs/narr/upgrading.rst b/docs/narr/upgrading.rst
index 87e4647c3..af552741c 100644
--- a/docs/narr/upgrading.rst
+++ b/docs/narr/upgrading.rst
@@ -103,7 +103,7 @@ a newer Pyramid release is always to read the :ref:`changelog` to find the
deprecations and removals for each release between the release you're currently
running and the one to which you wish to upgrade. The change history notes
every deprecation within a ``Deprecation`` section and every removal within a
-``Backwards Incompatibilies`` section for each release.
+``Backwards Incompatibilities`` section for each release.
The change history often contains instructions for changing your code to avoid
deprecation warnings and how to change docs-deprecated spellings to newer ones.
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index da2c41409..465477b4d 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -196,7 +196,7 @@ Non-Predicate Arguments
``require_csrf``
CSRF checks will affect any request method that is not defined as a "safe"
- method by RFC2616. In pratice this means that GET, HEAD, OPTIONS, and TRACE
+ method by RFC2616. In practice this means that GET, HEAD, OPTIONS, and TRACE
methods will pass untouched and all others methods will require CSRF. This
option is used in combination with the ``pyramid.require_default_csrf``
setting to control which request parameters are checked for CSRF tokens.
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 471820ef6..1726b85a1 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -95,7 +95,7 @@ explanation:
As shown in this example, the :term:`configurator` plays a central role in
Pyramid development. Building an application from loosely-coupled parts via
:doc:`../narr/configuration` is a central idea in Pyramid, one that we will
-revisit regurlarly in this *Quick Tour*.
+revisit regularly in this *Quick Tour*.
.. seealso:: See also:
:ref:`Quick Tutorial Hello World <qtut_hello_world>`,
diff --git a/docs/whatsnew-1.2.rst b/docs/whatsnew-1.2.rst
index 8572f04f5..8b1943822 100644
--- a/docs/whatsnew-1.2.rst
+++ b/docs/whatsnew-1.2.rst
@@ -232,7 +232,7 @@ Backwards Incompatibilities
config.add_view('my.pkg.someview', route_name='foo')
This won't effect "normal" users, only people who have legacy BFG codebases
- that used an autommitting configurator and possibly tests that use the
+ that used an autocommitting configurator and possibly tests that use the
configurator API (the configurator returned by
:func:`pyramid.testing.setUp` is an autocommitting configurator). The
right way to get around this is to use a default non-autocommitting
diff --git a/docs/whatsnew-1.5.rst b/docs/whatsnew-1.5.rst
index a477ce5ec..753dfd355 100644
--- a/docs/whatsnew-1.5.rst
+++ b/docs/whatsnew-1.5.rst
@@ -276,7 +276,7 @@ The feature additions in Pyramid 1.5 follow.
- You can now generate "hybrid" urldispatch/traversal URLs more easily by using
the new ``route_name``, ``route_kw`` and ``route_remainder_name`` arguments
to :meth:`~pyramid.request.Request.resource_url` and
- :meth:`~pyuramid.request.Request.resource_path`. See
+ :meth:`~pyramid.request.Request.resource_path`. See
:ref:`generating_hybrid_urls`.
- A new http exception superclass named
@@ -371,7 +371,7 @@ The feature additions in Pyramid 1.5 follow.
Other Backwards Incompatibilities
---------------------------------
-- Modified the :meth:`~pyramid.request.Reuqest.current_route_url` method. The
+- Modified the :meth:`~pyramid.request.Request.current_route_url` method. The
method previously returned the URL without the query string by default, it
now does attach the query string unless it is overriden.
@@ -441,7 +441,7 @@ Other Backwards Incompatibilities
since Pyramid 1.1. Use methods of ``request.environ`` (a real dictionary)
instead.
-- Removed ancient backwards compatibily hack in
+- Removed ancient backwards compatibility hack in
``pyramid.traversal.DefaultRootFactory`` which populated the ``__dict__`` of
the factory with the matchdict values for compatibility with BFG 0.9.
diff --git a/src/pyramid/config/actions.py b/src/pyramid/config/actions.py
index 4a526e242..29d06d716 100644
--- a/src/pyramid/config/actions.py
+++ b/src/pyramid/config/actions.py
@@ -168,7 +168,7 @@ class ActionState(object):
Return True if processing is needed and False otherwise. If
the callable needs to be processed, it will be marked as
- processed, assuming that the caller will procces the callable if
+ processed, assuming that the caller will process the callable if
it needs to be processed.
"""
if spec in self._seen_files:
diff --git a/src/pyramid/config/tweens.py b/src/pyramid/config/tweens.py
index c85639d14..feb4a3230 100644
--- a/src/pyramid/config/tweens.py
+++ b/src/pyramid/config/tweens.py
@@ -73,7 +73,7 @@ class TweensConfiguratorMixin(object):
If all options for ``under`` (or ``over``) cannot be found in the
current configuration, it is an error. If some options are specified
- purely for compatibilty with other tweens, just add a fallback of
+ purely for compatibility with other tweens, just add a fallback of
MAIN or INGRESS. For example, ``under=('mypkg.someothertween',
'mypkg.someothertween2', INGRESS)``. This constraint will require
the tween to be located under both the 'mypkg.someothertween' tween,
diff --git a/src/pyramid/config/views.py b/src/pyramid/config/views.py
index ac531ecb2..be7d331b4 100644
--- a/src/pyramid/config/views.py
+++ b/src/pyramid/config/views.py
@@ -751,7 +751,7 @@ class ViewsConfiguratorMixin(object):
It's useful when you want to always potentially show a view when some
object is traversed to, but you can't be sure about what kind of
object it will be, so you can't use the ``context`` predicate. The
- individual path elements inbetween slash characters or in tuple
+ individual path elements in between slash characters or in tuple
elements should be the Unicode representation of the name of the
resource and should not be encoded in any way.
diff --git a/src/pyramid/httpexceptions.py b/src/pyramid/httpexceptions.py
index 56797dc88..8dfb279ad 100644
--- a/src/pyramid/httpexceptions.py
+++ b/src/pyramid/httpexceptions.py
@@ -367,7 +367,7 @@ class HTTPRedirection(HTTPException):
This is an abstract base class for 3xx redirection. It indicates
that further action needs to be taken by the user agent in order
- to fulfill the request. It does not necessarly signal an error
+ to fulfill the request. It does not necessarily signal an error
condition.
"""
@@ -1040,7 +1040,7 @@ class HTTPExpectationFailed(HTTPClientError):
"""
subclass of :class:`~HTTPClientError`
- This indidcates that the expectation given in an Expect
+ This indicates that the expectation given in an Expect
request-header field could not be met by this server.
code: 417, title: Expectation Failed
diff --git a/src/pyramid/scripts/prequest.py b/src/pyramid/scripts/prequest.py
index eb2032419..759978936 100644
--- a/src/pyramid/scripts/prequest.py
+++ b/src/pyramid/scripts/prequest.py
@@ -18,7 +18,7 @@ class PRequestCommand(object):
description = """\
Submit a HTTP request to a web application.
- This command makes an artifical request to a web application that uses a
+ This command makes an artificial request to a web application that uses a
PasteDeploy (.ini) configuration file for the server and application.
Use "prequest config.ini /path" to request "/path".
diff --git a/src/pyramid/testing.py b/src/pyramid/testing.py
index ffddd233f..0cfc1a277 100644
--- a/src/pyramid/testing.py
+++ b/src/pyramid/testing.py
@@ -178,7 +178,7 @@ class DummyResource:
should be an interface object or tuple of interface objects
that will be attached to the resulting resource via
:func:`zope.interface.alsoProvides`. Any extra keywords passed
- in the ``kw`` argumnent will be set as direct attributes of
+ in the ``kw`` argument will be set as direct attributes of
the resource object.
.. note:: For backwards compatibility purposes, this class can also
diff --git a/tests/test_testing.py b/tests/test_testing.py
index 5b3ad0f22..ddcb35612 100644
--- a/tests/test_testing.py
+++ b/tests/test_testing.py
@@ -227,7 +227,7 @@ class TestDummyRequest(unittest.TestCase):
self.assertEqual(request.method, 'POST')
self.assertEqual(request.POST, POST)
# N.B.: Unlike a normal request, passing 'post' should *not* put
- # explict POST data into params: doing so masks a possible
+ # explicit POST data into params: doing so masks a possible
# XSS bug in the app. Tests for apps which don't care about
# the distinction should just use 'params'.
self.assertEqual(request.params, {})