diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2016-01-03 02:03:24 -0700 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2016-01-03 02:03:24 -0700 |
| commit | 30ae71b4a7ad97a649165374a75a70f4b64ae25c (patch) | |
| tree | b8a2cd06ff0130fd31b702862db2e46d39cd4e71 /HISTORY.txt | |
| parent | 504027873ab0e1b15601e2d1900ef8a4469f6a43 (diff) | |
| parent | 5558386fd1a6181b2e8ad06659049c055a7ed023 (diff) | |
| download | pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.tar.gz pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.tar.bz2 pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.zip | |
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'HISTORY.txt')
| -rw-r--r-- | HISTORY.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/HISTORY.txt b/HISTORY.txt index c30bb2711..68ddb3a90 100644 --- a/HISTORY.txt +++ b/HISTORY.txt @@ -1,6 +1,8 @@ 1.5 (2014-04-08) ================ +- Python 3.4 compatibility. + - Avoid crash in ``pserve --reload`` under Py3k, when iterating over possibly mutated ``sys.modules``. @@ -1130,6 +1132,8 @@ Bug Fixes Features -------- +- Python 3.3 compatibility. + - Configurator.add_directive now accepts arbitrary callables like partials or objects implementing ``__call__`` which dont have ``__name__`` and ``__doc__`` attributes. See https://github.com/Pylons/pyramid/issues/621 |