summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2013-03-29 08:01:41 -0700
committerTres Seaver <tseaver@palladion.com>2013-03-29 08:01:41 -0700
commit499039821338b307609d57a96a2b1bae3c8838a3 (patch)
treeaf83eb6f48d6d97923341d53c38fb4639bc0757d
parent5e06e508f3a619ba4fdf4f11cb30c84e808841e9 (diff)
parentf271a6b49c0b3b3d50404a100cbe85e44a11bc6a (diff)
downloadpyramid-499039821338b307609d57a96a2b1bae3c8838a3.tar.gz
pyramid-499039821338b307609d57a96a2b1bae3c8838a3.tar.bz2
pyramid-499039821338b307609d57a96a2b1bae3c8838a3.zip
Merge pull request #957 from tshepang/patch-1
grammar
-rw-r--r--pyramid/config/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index e1320a55f..4f7899b54 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -864,14 +864,14 @@ class Configurator(
This pushes a dictionary containing the :term:`application
registry` implied by ``registry`` attribute of this
configurator and the :term:`request` implied by the
- ``request`` argument on to the :term:`thread local` stack
+ ``request`` argument onto the :term:`thread local` stack
consulted by various :mod:`pyramid.threadlocal` API
functions."""
self.manager.push({'registry':self.registry, 'request':request})
def end(self):
""" Indicate that application or test configuration has ended.
- This pops the last value pushed on to the :term:`thread local`
+ This pops the last value pushed onto the :term:`thread local`
stack (usually by the ``begin`` method) and returns that
value.
"""
@@ -963,7 +963,7 @@ class Configurator(
# registry configured.
global_registries.add(self.registry)
- # Push the registry on to the stack in case any code that depends on
+ # Push the registry onto the stack in case any code that depends on
# the registry threadlocal APIs used in listeners subscribed to the
# IApplicationCreated event.
self.manager.push({'registry':self.registry, 'request':None})