X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fcookie.py;h=029e6928c9c2f1f8c092ff5df84e405e128a8362;hb=0a22b876bbda8fec0e584c37287528c151b81888;hp=140ba8fef0ee00294b40d2f37db3ef13ebdfcc2f;hpb=9bc70dab473c7057a20d182ce8566ad0a70a7c5d;p=wrw.git

diff --git a/wrw/cookie.py b/wrw/cookie.py
index 140ba8f..029e692 100644
--- a/wrw/cookie.py
+++ b/wrw/cookie.py
@@ -1,5 +1,5 @@
-import Cookie, time
-import proto
+import http.cookies, time
+from . import proto
 
 __all__ = ["cookies", "get", "add"]
 
@@ -11,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):
@@ -30,7 +30,9 @@ 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():
+            if key == "maxage":
+                key = "max-age"
             self.codec[name][key] = value
 
     def __setitem__(self, name, value):