[Python-checkins] r74647 - in python/trunk: Lib/Cookie.py Misc/NEWS

[georg.brandl]

Author: georg.brandl
Date: Fri Sep  4 10:17:04 2009
New Revision: 74647

Log:
Issue #5275: In Cookie's Cookie.load(), properly handle non-string arguments as documented.


Modified:
   python/trunk/Lib/Cookie.py
   python/trunk/Misc/NEWS

Modified: python/trunk/Lib/Cookie.py
==============================================================================
--- python/trunk/Lib/Cookie.py	(original)
+++ python/trunk/Lib/Cookie.py	Fri Sep  4 10:17:04 2009
@@ -624,7 +624,9 @@
         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()
 

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Fri Sep  4 10:17:04 2009
@@ -364,6 +364,9 @@
 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.