- The ``request_method`` predicate argument to

  ``pyramid.config.Configurator.add_view`` and
  ``pyramid.config.Configurator.add_route`` is now permitted to be a tuple of
  HTTP method names.  Previously it was restricted to being a string
  representing a single HTTP method name.

- Move add_view tests and tween tests to more reasonable places.

1 files changed, 12 insertions, 9 deletions

diff --git a/TODO.txt b/TODO.txt
index 9c939f94a..eca625904 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -8,13 +8,11 @@ Should-Have
   deploying via proxy:
   https://docs.pylonsproject.org/projects/pyramid_cookbook/dev/deployment/nginx.html#step-2-starting-paster
 
-- Allow ``request_method`` predicate to be a list of methods.
-
 Nice-to-Have
 ------------
 
-- Add a default-view-config-params decorator that can be applied to a class
-  which names defaults for method-based view_config decorator options.
+- Consider adding exclog to all scaffolds to print tracebacks to the console
+  while the debug toolbar is enabled.
 
 - Flesh out "paste" chapter.
 
@@ -29,8 +27,6 @@ Nice-to-Have
 - Deprecate pyramid.security.view_execution_permitted (it only works for
   traversal).
 
-- Merge Michael's route group work (maybe a 1.3 thing).
-
 - Some sort of API for rendering a view callable object to a response from
   within another view callable.
 
@@ -92,11 +88,18 @@ Future
 
 - 1.3: Kill off ``bfg.routes`` envvars in router.
 
-- 1.3: Kill off dependencies on Paste for non-deployment-related features.
+- 1.3/1.4: Kill off dependencies on Paste for non-deployment-related
+  features.
+
+- 1.3/1.4: use zope.registry rather than zope.component.
+
+- 1.3/1.4: get rid of zope.configuration dependency.
+
+- 1.3: Michael's route group work
 
-- 1.3: use zope.registry rather than zope.component.
+- 1.3: Add a default-view-config-params decorator that can be applied to a
+  class which names defaults for method-based view_config decorator options.
 
-- 1.3: get rid of zope.configuration dependency.
 
 Probably Bad Ideas
 ------------------