summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 8cb4c602e..198dfaab5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,10 +24,9 @@ Bug Fixes
and `attr` is involved.
See: https://github.com/Pylons/pyramid/pull/2687
-- The JSON renderers now encode their result as UTF-8. The renderer helper
- will now warn the user and encode the result as UTF-8 if a renderer returns a
- text type and the response does not have a valid character set. See
- https://github.com/Pylons/pyramid/pull/2706
+- Fix a ``FutureWarning`` in Python 3.5 when using ``re.split`` on the
+ ``format`` setting to the ``proutes`` script.
+ See https://github.com/Pylons/pyramid/pull/2714
Deprecations
------------