From 186c5f07e65c95b23087abe33670efa95eca497b Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 2 Nov 2014 22:35:47 +0200
Subject: [PATCH] Issue #22775: Fixed unpickling of Cookie.SimpleCookie with
 protocol 2. Patch by Tim Graham.

---
 Lib/Cookie.py           |  8 ++++++--
 Lib/test/test_cookie.py | 13 +++++++++++++
 Misc/ACKS               |  1 +
 Misc/NEWS               |  3 +++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/Lib/Cookie.py b/Lib/Cookie.py
index d674437457..0b15531196 100644
--- a/Lib/Cookie.py
+++ b/Lib/Cookie.py
@@ -591,8 +591,12 @@ class BaseCookie(dict):
 
     def __setitem__(self, key, value):
         """Dictionary style assignment."""
-        rval, cval = self.value_encode(value)
-        self.__set(key, rval, cval)
+        if isinstance(value, Morsel):
+            # allow assignment of constructed Morsels (e.g. for pickling)
+            dict.__setitem__(self, key, value)
+        else:
+            rval, cval = self.value_encode(value)
+            self.__set(key, rval, cval)
     # end __setitem__
 
     def output(self, attrs=None, header="Set-Cookie:", sep="\015\012"):
diff --git a/Lib/test/test_cookie.py b/Lib/test/test_cookie.py
index 41ba60f9d2..36cd52e58f 100644
--- a/Lib/test/test_cookie.py
+++ b/Lib/test/test_cookie.py
@@ -3,6 +3,7 @@
 from test.test_support import run_unittest, run_doctest, check_warnings
 import unittest
 import Cookie
+import pickle
 
 
 class CookieTests(unittest.TestCase):
@@ -141,6 +142,18 @@ class CookieTests(unittest.TestCase):
             self.assertEqual(dict(C), {})
             self.assertEqual(C.output(), '')
 
+    def test_pickle(self):
+        rawdata = 'Customer="WILE_E_COYOTE"; Path=/acme; Version=1'
+        expected_output = 'Set-Cookie: %s' % rawdata
+
+        C = Cookie.SimpleCookie()
+        C.load(rawdata)
+        self.assertEqual(C.output(), expected_output)
+
+        for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+            C1 = pickle.loads(pickle.dumps(C, protocol=proto))
+            self.assertEqual(C1.output(), expected_output)
+
 
 def test_main():
     run_unittest(CookieTests)
diff --git a/Misc/ACKS b/Misc/ACKS
index b1d6d3f072..d44240f0f9 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -484,6 +484,7 @@ Chris Gonnerman
 Shelley Gooch
 David Goodger
 Hans de Graaff
+Tim Graham
 Nathaniel Gray
 Eddy De Greef
 Grant Griffin
diff --git a/Misc/NEWS b/Misc/NEWS
index 1da8970130..57c752ca66 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,6 +37,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #22775: Fixed unpickling of Cookie.SimpleCookie with protocol 2.
+  Patch by Tim Graham.
+
 - Issue #22776: Brought excluded code into the scope of a try block in
   SysLogHandler.emit().
  
-- 
2.50.1