Merge remote branch 'refs/remotes/upstream/viewderiver' into ra_view_decoration

Conflicts:
	CHANGES.txt
	pyramid/config.py

1 files changed, 6 insertions, 3 deletions

diff --git a/TODO.txt b/TODO.txt
index f81c78387..ada3c4c2a 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -8,6 +8,12 @@ Must-Have (before 1.0)
 
 - Consider deprecations for ``model`` and ``resource`` APIs.
 
+- Re-make testing.setUp() and testing.tearDown() the canonical APIs for test
+  configuration.
+
+- ``decorator=`` parameter to view_config.  This would replace the existing
+  _map_view "decorator" if it existed (Rob needs).
+
 Should-Have
 -----------
 
@@ -26,9 +32,6 @@ Should-Have
 - Change "Cleaning up After a Request" in the urldispatch chapter to
   use ``request.add_response_callback``.
 
-- ``decorator=`` parameter to view_config.  This would replace the existing
-  _map_view "decorator" if it existed.
-
 - Provide a response_set_cookie method on the request for rendered responses
   that can be used as input to response.set_cookie?