X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fcookie.py;h=b66e293f62752f285bbc1e0acdd79cc00001477d;hb=920b69c320cb0dc83eec0c8b4397c7a5b80b7d5b;hp=16ddf81ccffccbe258ac37f9c13d9d447e744e21;hpb=d99a17a601c0680a325338189e6eeac0eb7d7bce;p=wrw.git

diff --git a/wrw/cookie.py b/wrw/cookie.py
index 16ddf81..b66e293 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"]
 
@@ -10,10 +11,10 @@ def addcookies(req):
 class cookiedict(object):
     def __init__(self, req):
         try:
-            self.bk = Cookie.SimpleCookie(req.ihead.get("Cookie"))
-        except Cookie.CookieError:
-            self.bk = Cookie.SimpleCookie()
-        self.codec = Cookie.SimpleCookie()
+            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):
@@ -29,7 +30,7 @@ class cookiedict(object):
 
     def add(self, name, value, **kw):
         self.codec[name] = value
-        for key, value in kw.iteritems():
+        for key, value in kw.items():
             self.codec[name][key] = value
 
     def __setitem__(self, name, value):
@@ -43,3 +44,5 @@ def get(req, name, default = None):
 
 def add(req, name, value, **kw):
     cookies(req).add(name, value, **kw)
+
+cdate = proto.httpdate