summaryrefslogtreecommitdiff
path: root/HISTORY.txt
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2016-01-03 02:09:59 -0700
committerBert JW Regeer <bertjw@regeer.org>2016-01-03 02:09:59 -0700
commita2dff0592714d9cde5a0a612411aa96ce9d94b3c (patch)
tree6dac581990ba758670a8424cafe8bf31888471f7 /HISTORY.txt
parent29e1002a108d045e1f80be3137f2cde4e47ca642 (diff)
parent5558386fd1a6181b2e8ad06659049c055a7ed023 (diff)
downloadpyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.tar.gz
pyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.tar.bz2
pyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.zip
Merge branch 'master' into feature/alchemy-scaffold-update
Diffstat (limited to 'HISTORY.txt')
-rw-r--r--HISTORY.txt4
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