summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-04-14 19:05:38 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-04-14 19:05:38 (GMT)
commit84ee3103a3d0fd5a56a8d33ddacacafe858d0e1c (patch)
treebd718dcc935222f8a8e0e740ea4ba437a3fb7712 /Misc
parent6f353a04a3b94ab8ef22feb32adb70811febc9be (diff)
downloadcpython-84ee3103a3d0fd5a56a8d33ddacacafe858d0e1c.zip
cpython-84ee3103a3d0fd5a56a8d33ddacacafe858d0e1c.tar.gz
cpython-84ee3103a3d0fd5a56a8d33ddacacafe858d0e1c.tar.bz2
Merged revisions 80078 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80078 | r.david.murray | 2010-04-14 14:59:18 -0400 (Wed, 14 Apr 2010) | 9 lines Merged revisions 80062 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80062 | r.david.murray | 2010-04-13 16:57:40 -0400 (Tue, 13 Apr 2010) | 2 lines Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters. ........ ................
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS2
-rw-r--r--Misc/NEWS2
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 3638cc0..410158a 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -154,6 +154,7 @@ David Cournapeau
Steve Cousins
Alex Coventry
Matthew Dixon Cowles
+Ryan Coyner
Christopher A. Craig
Laura Creighton
Simon Cross
@@ -654,6 +655,7 @@ George Sakkis
Rich Salz
Kevin Samborn
Ilya Sandler
+Mark Sapiro
Ty Sarna
Ben Sayer
Michael Scharf
diff --git a/Misc/NEWS b/Misc/NEWS
index d72ce12..536ea43 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,8 @@ Core and Builtins
Library
-------
+- Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters.
+
- Issue #8383: pickle and pickletools use surrogatepass error handler when
encoding unicode as utf8 to support lone surrogates and stay compatible with
Python 2.x and 3.0