summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2013-05-11 05:33:28 -0700
committerTres Seaver <tseaver@palladion.com>2013-05-11 05:33:28 -0700
commit924a7048ada648b3190b5f73c4df4dbccf37286a (patch)
tree48e08d545c7860972d0876f1f099cec23ad31348
parentdbdfb2fea3851e31e272ebbba4297a138d74e970 (diff)
parent688a93af3f074edb5ece07661c35fd2019a800f5 (diff)
downloadpyramid-924a7048ada648b3190b5f73c4df4dbccf37286a.tar.gz
pyramid-924a7048ada648b3190b5f73c4df4dbccf37286a.tar.bz2
pyramid-924a7048ada648b3190b5f73c4df4dbccf37286a.zip
Merge pull request #1016 from tshepang/patch-1
add missing word; be more precise
-rw-r--r--pyramid/testing.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pyramid/testing.py b/pyramid/testing.py
index 0c701727b..06b795f9a 100644
--- a/pyramid/testing.py
+++ b/pyramid/testing.py
@@ -482,9 +482,9 @@ def tearDown(unhook_zca=True):
If the ``unhook_zca`` argument is ``True`` (the default), call
:func:`zope.component.getSiteManager.reset`. This undoes the
- action of :func:`pyramid.testing.setUp` called with the
+ action of :func:`pyramid.testing.setUp` when called with the
argument ``hook_zca=True``. If :mod:`zope.component` cannot be
- imported, ignore the argument.
+ imported, ``unhook_zca`` is set to ``False``.
"""
global have_zca
if unhook_zca and have_zca: