diff options
Diffstat (limited to 'Lib/Cookie.py')
| -rw-r--r-- | Lib/Cookie.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/Lib/Cookie.py b/Lib/Cookie.py index b7ee19c..dd116b7 100644 --- a/Lib/Cookie.py +++ b/Lib/Cookie.py @@ -70,8 +70,8 @@ a dictionary. >>> C["fig"] = "newton" >>> C["sugar"] = "wafer" >>> print C - Set-Cookie: sugar=wafer; Set-Cookie: fig=newton; + Set-Cookie: sugar=wafer; Notice that the printable representation of a Cookie is the appropriate format for a Set-Cookie: header. This is the @@ -93,8 +93,8 @@ HTTP_COOKIE environment variable. >>> C = Cookie.SmartCookie() >>> C.load("chips=ahoy; vienna=finger") >>> print C - Set-Cookie: vienna=finger; Set-Cookie: chips=ahoy; + Set-Cookie: vienna=finger; The load() method is darn-tootin smart about identifying cookies within a string. Escaped quotation marks, nested semicolons, and other @@ -493,7 +493,9 @@ class Morsel(UserDict): # Now add any defined attributes if attrs is None: attrs = self._reserved_keys - for K,V in self.items(): + items = self.items() + items.sort() + for K,V in items: if V == "": continue if K not in attrs: continue if K == "expires" and type(V) == type(1): @@ -586,7 +588,9 @@ class BaseCookie(UserDict): def output(self, attrs=None, header="Set-Cookie:", sep="\n"): """Return a string suitable for HTTP.""" result = [] - for K,V in self.items(): + items = self.items() + items.sort() + for K,V in items: result.append( V.output(attrs, header) ) return string.join(result, sep) # end output @@ -595,14 +599,18 @@ class BaseCookie(UserDict): def __repr__(self): L = [] - for K,V in self.items(): + items = self.items() + items.sort() + for K,V in items: L.append( '%s=%s' % (K,repr(V.value) ) ) return '<%s: %s>' % (self.__class__.__name__, string.join(L)) def js_output(self, attrs=None): """Return a string suitable for JavaScript.""" result = [] - for K,V in self.items(): + items = self.items() + items.sort() + for K,V in items: result.append( V.js_output(attrs) ) return string.join(result, "") # end js_output |