From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 2 Nov 2014 20:19:56 +0000 (+0200)
Subject: Issue #22775: Fixed unpickling of http.cookies.SimpleCookie with protocol 2
X-Git-Tag: v3.5.0a1~531
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2cb0e73a89589ce56ba17da39a06f8017cfc92e4;p=thirdparty%2FPython%2Fcpython.git

Issue #22775: Fixed unpickling of http.cookies.SimpleCookie with protocol 2
and above.  Patch by Tim Graham.
---

2cb0e73a89589ce56ba17da39a06f8017cfc92e4
diff --cc Misc/ACKS
index 23e97d41a27b,30b6a0ec22d9..a63bac76f57b
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -496,7 -492,7 +496,8 @@@ Chris Gonnerma
  Shelley Gooch
  David Goodger
  Hans de Graaff
+ Tim Graham
 +Kim Gräsman
  Nathaniel Gray
  Eddy De Greef
  Grant Griffin
diff --cc Misc/NEWS
index 0c853905bf75,ee1c53f4b921..8d9564da7cc2
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -183,6 -36,13 +183,9 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #22775: Fixed unpickling of http.cookies.SimpleCookie with protocol 2
+   and above.  Patch by Tim Graham.
+ 
 -- Issue #22366: urllib.request.urlopen will accept a context object
 -  (SSLContext) as an argument which will then used be for HTTPS connection.
 -  Patch by Alex Gaynor.
 -
  - Issue #22776: Brought excluded code into the scope of a try block in
    SysLogHandler.emit().