From d22b9519d120d3a6a678f516c1ee020601c3ac3a Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 4 Sep 2009 08:17:04 +0000
Subject: [PATCH] Issue #5275: In Cookie's Cookie.load(), properly handle
 non-string arguments as documented.

---
 Lib/Cookie.py | 4 +++-
 Misc/NEWS     | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Lib/Cookie.py b/Lib/Cookie.py
index 1ccfd160a49..fc6d9f61b6c 100644
--- a/Lib/Cookie.py
+++ b/Lib/Cookie.py
@@ -624,7 +624,9 @@ class BaseCookie(dict):
         if type(rawdata) == type(""):
             self.__ParseString(rawdata)
         else:
-            self.update(rawdata)
+            # self.update() wouldn't call our custom __setitem__
+            for k, v in rawdata.items():
+                self[k] = v
         return
     # end load()
 
diff --git a/Misc/NEWS b/Misc/NEWS
index eea32c1a901..b517b978cfc 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -364,6 +364,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #5275: In Cookie's Cookie.load(), properly handle non-string arguments
+  as documented.
+
 - Issue #2666: Handle BROWSER environment variable properly for unknown browser
   names in the webbrowser module.