diff options
| author | Chris McDonough <chrism@plope.com> | 2014-05-05 23:56:09 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2014-05-05 23:56:09 -0400 |
| commit | 7423971bf8aaa5fd205778820d91a6c7e3cea1bd (patch) | |
| tree | 35130316c871ff0d8c41c3ad57a5f5cc1d876c7c /CHANGES.txt | |
| parent | 7a6bf6f0ff1b85d0158ad49fc21037db4999c1cf (diff) | |
| parent | f9bc568657f316f20b5f576085472b80dec15cba (diff) | |
| download | pyramid-7423971bf8aaa5fd205778820d91a6c7e3cea1bd.tar.gz pyramid-7423971bf8aaa5fd205778820d91a6c7e3cea1bd.tar.bz2 pyramid-7423971bf8aaa5fd205778820d91a6c7e3cea1bd.zip | |
fix merge conflicts
Diffstat (limited to 'CHANGES.txt')
| -rw-r--r-- | CHANGES.txt | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index da8db870f..2b80e87e2 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,17 @@ Next release ============ +Bug Fixes +--------- + +- ``pyramid.wsgi.wsgiapp`` and ``pyramid.wsgi.wsgiapp2`` now raise + ``ValueError`` when accidentally passed ``None``. + +- Fix an issue whereby predicates would be resolved as maybe_dotted in the + introspectable but not when passed for registration. This would mean that + add_route_predicate for example can not take a string and turn it into the + actual callable function. + Docs ---- @@ -8,6 +19,17 @@ Docs scaffolding- and logging-related chapters to avoid needing to explain it too early. +- Clarify a previously-implied detail of the ``ISession.invalidate`` API + documentation. + +Scaffolds +--------- + +- Update scaffold generating machinery to return the version of pyramid and + pyramid docs for use in scaffolds. Updated starter, alchemy and zodb + templates to have links to correctly versioned documentation and reflect + which pyramid was used to generate the scaffold. + 1.5 (2014-04-08) ================ |