X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=blobdiff_plain;f=wrw%2Fcookie.py;h=c6e848f325ba2ee48d307f7029478b7c82365af5;hp=2c6f982a1248bef705aaf137f295de5e753aa914;hb=HEAD;hpb=b409a33843abb3221edd27016558c39cf33a6510

diff --git a/wrw/cookie.py b/wrw/cookie.py
index 2c6f982..c6e848f 100644
--- a/wrw/cookie.py
+++ b/wrw/cookie.py
@@ -1,4 +1,5 @@
-import Cookie
+import http.cookies, time
+from . import proto
 
 __all__ = ["cookies", "get", "add"]
 
@@ -9,8 +10,11 @@ def addcookies(req):
 
 class cookiedict(object):
     def __init__(self, req):
-        self.bk = Cookie.SimpleCookie(req.ihead.get("Cookie"))
-        self.codec = Cookie.SimpleCookie()
+        try:
+            self.bk = http.cookies.SimpleCookie(req.ihead.get("Cookie"))
+        except http.cookies.CookieError:
+            self.bk = http.cookies.SimpleCookie()
+        self.codec = http.cookies.SimpleCookie()
         req.oncommit(addcookies)
 
     def __getitem__(self, name):
@@ -19,14 +23,15 @@ class cookiedict(object):
     def __contains__(self, name):
         return name in self.bk
 
-    def get(self, name, default = None):
+    def get(self, name, default=None):
         if name not in self.bk:
             return default
         return self.bk[name].value
 
-    def add(self, name, value, path = None):
+    def add(self, name, value, **kw):
         self.codec[name] = value
-        if path is not None: self.codec[name]["path"] = path
+        for key, value in kw.items():
+            self.codec[name][key] = value
 
     def __setitem__(self, name, value):
         self.add(name, value)
@@ -34,8 +39,10 @@ class cookiedict(object):
 def cookies(req):
     return req.item(cookiedict)
 
-def get(req, name, default = None):
+def get(req, name, default=None):
     return cookies(req).get(name, default)
 
-def add(req, name, value, path = None):
-    cookies(req).add(name, value, path)
+def add(req, name, value, **kw):
+    cookies(req).add(name, value, **kw)
+
+cdate = proto.httpdate