summaryrefslogtreecommitdiff
path: root/HISTORY.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2016-02-07 16:34:46 -0500
committerChris McDonough <chrism@plope.com>2016-02-07 16:34:46 -0500
commitdf7a123a847e2243f38688c033f06200382ba139 (patch)
treecc8e032c2a85d9fee45e68f7f3501046c8bec8ed /HISTORY.txt
parent5cd91621668807f9b66811fe57a04fba96e7458a (diff)
parented04017d5a8e82db2e46412f841c55d83ef062b0 (diff)
downloadpyramid-df7a123a847e2243f38688c033f06200382ba139.tar.gz
pyramid-df7a123a847e2243f38688c033f06200382ba139.tar.bz2
pyramid-df7a123a847e2243f38688c033f06200382ba139.zip
Merge branch 'master' of github.com:Pylons/pyramid
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