[pypy-commit] pypy code_page-utf8: close branch to be merged

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: code_page-utf8
Changeset: r98041:3805e48e8f37
Date: 2019-11-12 22:31 -0500
http://bitbucket.org/pypy/pypy/changeset/3805e48e8f37/

Log:	close branch to be merged

diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
--- a/pypy/doc/whatsnew-pypy3-head.rst
+++ b/pypy/doc/whatsnew-pypy3-head.rst
@@ -9,3 +9,11 @@
 .. branch: py3.6-asyncgen
 
 Fix asyncgen_hooks and refactor coroutine execution
+
+.. branch: py3.6-exc-info
+
+Follow CPython's use of exc_info more closely (issue 3096)
+
+.. branch: code_page-utf8
+
+Add encoding, decoding of codepages on windows