summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-11-23 05:57:27 +0000
committerChris McDonough <chrism@agendaless.com>2009-11-23 05:57:27 +0000
commit702828282c350bdfec0f66f1c505f49250ae1e0a (patch)
tree1c7022bcb8be324cbc9cf345131f9c8b5ff6b420
parent44b16bf734c3d7aa9c862f492606ce065534cc7e (diff)
downloadpyramid-702828282c350bdfec0f66f1c505f49250ae1e0a.tar.gz
pyramid-702828282c350bdfec0f66f1c505f49250ae1e0a.tar.bz2
pyramid-702828282c350bdfec0f66f1c505f49250ae1e0a.zip
Save a function call.
Update text files.
-rw-r--r--CHANGES.txt8
-rw-r--r--TODO.txt2
-rw-r--r--repoze/bfg/router.py2
3 files changed, 8 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 4fb94ba96..3ad281f6d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,9 +4,11 @@ Next release
Features
--------
-- The ``repoze.bfg.testing.setUp`` function now causes a request
- object to be created. The request object is avaiable via
- ``repoze.bfg.threadlocal.get_current_request``. Previously this
+- The ``repoze.bfg.testing.setUp`` function now causes a "dummy"
+ request object to be created (an instance of
+ ``repoze.bfg.testing.DummyRequest``). The DummyRequest object is
+ available via ``repoze.bfg.threadlocal.get_current_request`` when
+ this API is used in the setUp of a unit test. Previously this
function did not create a request object; it instead assigned
``None`` to the threadlocal request value.
diff --git a/TODO.txt b/TODO.txt
index 47418bca3..b69ae3dbd 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -5,3 +5,5 @@
- Allow policies, settings, and a root factory to be passed to
Configurator constructor.
+- Decide about creating a "real" request object during testing.setUp
+ vs. creating a dummy request.
diff --git a/repoze/bfg/router.py b/repoze/bfg/router.py
index 16c273012..ccf3d1a76 100644
--- a/repoze/bfg/router.py
+++ b/repoze/bfg/router.py
@@ -88,7 +88,7 @@ class Router(object):
attrs['root'] = root
# view lookup
- traverser = registry.queryAdapter(root, ITraverser)
+ traverser = registry.adapters.queryAdapter(root, ITraverser)
if traverser is None:
traverser = ModelGraphTraverser(root)
tdict = traverser(request)