1.1 --- a/WebStack/Twisted.py Thu Sep 16 22:18:33 2004 +0000
1.2 +++ b/WebStack/Twisted.py Thu Sep 16 22:19:45 2004 +0000
1.3 @@ -264,10 +264,7 @@
1.4 NOTE: introduced.
1.5 """
1.6
1.7 - cookies = {}
1.8 - for name, value in self.trans.received_cookies.items():
1.9 - cookies[name] = Cookie(name, value)
1.10 - return cookies
1.11 + return self.process_cookies(self.trans.received_cookies, using_strings=1)
1.12
1.13 def get_cookie(self, cookie_name):
1.14
1.15 @@ -280,7 +277,11 @@
1.16 NOTE: introduced.
1.17 """
1.18
1.19 - return Cookie(cookie_name, self.trans.getCookie(cookie_name))
1.20 + value = self.trans.getCookie(self.encode_cookie_value(cookie_name))
1.21 + if value is not None:
1.22 + return Cookie(cookie_name, self.decode_cookie_value(value))
1.23 + else:
1.24 + return None
1.25
1.26 # Response-related methods.
1.27
1.28 @@ -355,7 +356,7 @@
1.29 Stores the given 'cookie' object in the response.
1.30 """
1.31
1.32 - self.trans.addCookie(cookie.name, cookie.value, expires=cookie.expires, path=cookie.path)
1.33 + self.set_cookie_value(cookie.name, cookie.value, path=cookie.path, expires=cookie.expires)
1.34
1.35 def set_cookie_value(self, name, value, path=None, expires=None):
1.36
1.37 @@ -367,8 +368,8 @@
1.38 time.time function, and indicates the expiry date/time of the cookie.
1.39 """
1.40
1.41 - self.trans.addCookie(self.format_header_value(name),
1.42 - self.format_header_value(value), expires=expires, path=path)
1.43 + self.trans.addCookie(self.encode_cookie_value(name),
1.44 + self.encode_cookie_value(value), expires=expires, path=path)
1.45
1.46 def delete_cookie(self, cookie_name):
1.47
1.48 @@ -381,7 +382,7 @@
1.49 # has been sent the cookie or not.
1.50 # NOTE: Magic discovered in Webware.
1.51
1.52 - self.trans.addCookie(cookie_name, "", expires=0, path="/", max_age=0)
1.53 + self.trans.addCookie(self.encode_cookie_value(cookie_name), "", expires=0, path="/", max_age=0)
1.54
1.55 # Session-related methods.
1.56