1.1 --- a/WebStack/Webware.py Thu Sep 16 22:18:33 2004 +0000
1.2 +++ b/WebStack/Webware.py Thu Sep 16 22:19:45 2004 +0000
1.3 @@ -254,10 +254,7 @@
1.4 Returns a dictionary mapping cookie names to cookie objects.
1.5 """
1.6
1.7 - cookies = {}
1.8 - for name, value in self.trans.request().cookies().items():
1.9 - cookies[name] = Cookie(name, value)
1.10 - return cookies
1.11 + return self.process_cookies(self.trans.request().cookies(), using_strings=1)
1.12
1.13 def get_cookie(self, cookie_name):
1.14
1.15 @@ -269,7 +266,8 @@
1.16 """
1.17
1.18 try:
1.19 - return Cookie(cookie_name, self.trans.request().cookie(cookie_name))
1.20 + value = self.trans.request().cookie(self.encode_cookie_value(cookie_name))
1.21 + return Cookie(cookie_name, self.decode_cookie_value(value))
1.22 except KeyError:
1.23 return None
1.24
1.25 @@ -353,7 +351,8 @@
1.26 Stores the given 'cookie' object in the response.
1.27 """
1.28
1.29 - self.trans.response().addCookie(cookie)
1.30 + self.set_cookie_value(cookie.name, cookie.value)
1.31 + #self.trans.response().addCookie(cookie)
1.32
1.33 def set_cookie_value(self, name, value, path=None, expires=None):
1.34
1.35 @@ -365,7 +364,8 @@
1.36 time.time function, and indicates the expiry date/time of the cookie.
1.37 """
1.38
1.39 - self.trans.response().setCookie(name, value, path, expires)
1.40 + self.trans.response().setCookie(self.encode_cookie_value(name),
1.41 + self.encode_cookie_value(value), path, expires)
1.42
1.43 def delete_cookie(self, cookie_name):
1.44
1.45 @@ -374,7 +374,7 @@
1.46 'cookie_name' be deleted/discarded by the client.
1.47 """
1.48
1.49 - self.trans.response().delCookie(cookie_name)
1.50 + self.trans.response().delCookie(self.encode_cookie_value(cookie_name))
1.51
1.52 # Session-related methods.
1.53