Merge remote branch 'source/master'

Conflicts:
	docs/narr/hooks.rst

1 files changed, 63 insertions, 16 deletions

diff --git a/TODO.txt b/TODO.txt
index 3a32322f8..5a88c9102 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,32 +1,76 @@
 Pyramid TODOs
 =============
 
-Must-Have (before 1.0)
-----------------------
+Should-Have
+-----------
 
-- Narrative docs for ``Configurator.include`` and ``Configurator.commit``.
+- Move newrequest send event into inner try block in router so exceptions
+  generated by newrequest subscribers can serve as exception view gotos.
 
-- Consider deprecations for ``model`` and ``resource`` APIs.
+- https://github.com/Pylons/pyramid/issues#issue/67 (fixing would make it
+  possible to render a static site from a static dir).
 
-Should-Have
------------
+- Consider per-form_id CSRF instead of per-session global CSRF token.
 
-- Add narrative docs for wsgiapp and wsgiapp2.
+- I18N support for pyramid_jinja2.  See also -
+  http://groups.google.com/group/pylons-devel/msg/ab58353594b135c9 and
+  https://github.com/Pylons/pyramid_jinja2/pull/14 
+
+- Speed up startup time (defer _bootstrap and registerCommonDirectives()
+  until needed by ZCML, as well as unfound speedups).
+
+- Reversing (context, request) in function view callable arglist produces
+  incomprehensible traceback::
+
+   def aview(request, context):
+       return {}
+
+   if __name__ == '__main__':
+       from pyramid.config import Configurator
+       from paste.httpserver import serve
+       c = Configurator()
+       c.add_view(aview, renderer='__main__:foo.pt')
+       serve(c.make_wsgi_app())
+
+   File "/home/chrism/projects/pyramid/pyramid/config.py", line 2981, in map_nonclass
+   ronly = requestonly(view, self.attr)
+   File "/home/chrism/projects/pyramid/pyramid/config.py", line 3071, in requestonly
+   if len(args) - len(defaults) == 1:
+   zope.configuration.config.ConfigurationExecutionError: <type 'exceptions.TypeError'>: object of type 'NoneType' has no len()                                    in:
+    ('reversed.py', 14, '<module>', "c.add_view(aview, renderer='__main__:foo.pt')")
+
+- Fix misleading conflict error reports for static views ala
+  http://cluebin.appspot.com/pasted/7242843
 
-- Add docs for httpexceptions module for each webob.exc class that inherits
-  from WSGIHTTPException.
+- Nicer Mako exceptions in WebError.
+
+- Consider adding a default exception view for HTTPException and attendant
+  ``redirect`` and ``abort`` functions ala Pylons (promised Mike I'd enable
+  this in 1.1).
+
+- Add notes about renderer response attrs to request docs.
+
+- Add an example of using a cascade to serve static assets from the root.
+
+- Explore static file return from handler action using wsgiapp2 + fileapp.
+
+- Static (URL-generation only) routes.
+
+- Add narrative docs for wsgiapp and wsgiapp2.
 
 - translationdir ZCML directive use of ``path_spec`` should maybe die.
 
-- Change "Cleaning up After a Request" in the urldispatch chapter to
-  use ``request.add_response_callback``.
+- Provide a response_set_cookie method on the request for rendered responses
+  that can be used as input to response.set_cookie?
 
-- ``decorator=`` parameter to view_config.  This would replace the existing
-  _map_view "decorator" if it existed.
+- Make it possible to get at ACLDenied data from Forbidden response in
+  exceptionview.
 
 Nice-to-Have
 ------------
 
+- Better "Extending" chapter.
+
 - Try to make test suite pass on IronPython.
 
 - Non-bwcompat use of threadlocals that need to be documented or ameliorated:
@@ -80,9 +124,6 @@ Nice-to-Have
          action = '^foo$'
            mypackage.views.MyView.foo_GET
 
-- Provide a response_cookies attribute on the request for rendered
-  responses that can be used as input to response.set_cookie.
-
 - Raise an exception when a value in response_headerlist is not a
   string or decide to encode.
 
@@ -90,3 +131,9 @@ Nice-to-Have
 
 - Add functionality that mocks the behavior of ``repoze.browserid``.
 
+- Consider implementing the API outlined in
+  http://plope.com/pyramid_auth_design_api_postmortem, phasing out the
+  current auth-n-auth abstractions in a backwards compatible way.
+
+- Add doc string for BeforeRender event with more details.
+