summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-04-14 18:59:18 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-04-14 18:59:18 (GMT)
commitd48739f32d4560d21e1d8582782ce5f3941e912e (patch)
treea2e4fe789915d81d0e48b75021689e11b8a5b564 /Misc
parenta1bda34cba2de56bd902943aae909e96d3a14b2b (diff)
downloadcpython-d48739f32d4560d21e1d8582782ce5f3941e912e.zip
cpython-d48739f32d4560d21e1d8582782ce5f3941e912e.tar.gz
cpython-d48739f32d4560d21e1d8582782ce5f3941e912e.tar.bz2
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 d2c01aa..4471ab1 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -162,6 +162,7 @@ David Cournapeau
Steve Cousins
Alex Coventry
Matthew Dixon Cowles
+Ryan Coyner
Christopher A. Craig
Laura Creighton
Simon Cross
@@ -670,6 +671,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 e17ceef..489b0ed 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -312,6 +312,8 @@ C-API
Library
-------
+- Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters.
+
- Issue #7316: the acquire() method of lock objects in the :mod:`threading`
module now takes an optional timeout argument in seconds. Timeout support
relies on the system threading library, so as to avoid a semi-busy wait