diff options
| author | Chris McDonough <chrism@plope.com> | 2013-07-21 13:25:55 -0700 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-07-21 13:25:55 -0700 |
| commit | 1cbd23bb4f4763a49b0328508d54e12d9f886b82 (patch) | |
| tree | 1da6848dbfed3fc1d5d1bf5df033f573df449f99 | |
| parent | e7638bfd959811bb85f681ff2ad8d43d716018ad (diff) | |
| parent | 8a7d6c22807e43cc3dd3e1b8317a9feb952f969f (diff) | |
| download | pyramid-1cbd23bb4f4763a49b0328508d54e12d9f886b82.tar.gz pyramid-1cbd23bb4f4763a49b0328508d54e12d9f886b82.tar.bz2 pyramid-1cbd23bb4f4763a49b0328508d54e12d9f886b82.zip | |
Merge pull request #1051 from ronnix/patch-5
Fix documentation of testing.setUp
| -rw-r--r-- | pyramid/testing.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pyramid/testing.py b/pyramid/testing.py index 9bd245e4e..14c6f4acf 100644 --- a/pyramid/testing.py +++ b/pyramid/testing.py @@ -411,7 +411,7 @@ def setUp(registry=None, request=None, hook_zca=True, autocommit=True, suitable testing analogue. After ``setUp`` is finished, the registry returned by the - :func:`pyramid.threadlocal.get_current_request` function will + :func:`pyramid.threadlocal.get_current_registry` function will be the passed (or constructed) registry until :func:`pyramid.testing.tearDown` is called (or :func:`pyramid.testing.setUp` is called again) . |