X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fcookie.py;h=140ba8fef0ee00294b40d2f37db3ef13ebdfcc2f;hb=refs%2Fheads%2Fpython2;hp=b66e293f62752f285bbc1e0acdd79cc00001477d;hpb=a7a0908019bb95bb2be1c01e97e88f344807ccec;p=wrw.git

diff --git a/wrw/cookie.py b/wrw/cookie.py
index b66e293..140ba8f 100644
--- a/wrw/cookie.py
+++ b/wrw/cookie.py
@@ -1,5 +1,5 @@
-import http.cookies, time
-from . import proto
+import Cookie, time
+import proto
 
 __all__ = ["cookies", "get", "add"]
 
@@ -11,10 +11,10 @@ def addcookies(req):
 class cookiedict(object):
     def __init__(self, req):
         try:
-            self.bk = http.cookies.SimpleCookie(req.ihead.get("Cookie"))
-        except http.cookies.CookieError:
-            self.bk = http.cookies.SimpleCookie()
-        self.codec = http.cookies.SimpleCookie()
+            self.bk = Cookie.SimpleCookie(req.ihead.get("Cookie"))
+        except Cookie.CookieError:
+            self.bk = Cookie.SimpleCookie()
+        self.codec = Cookie.SimpleCookie()
         req.oncommit(addcookies)
 
     def __getitem__(self, name):
@@ -23,14 +23,14 @@ 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, **kw):
         self.codec[name] = value
-        for key, value in kw.items():
+        for key, value in kw.iteritems():
             self.codec[name][key] = value
 
     def __setitem__(self, name, value):
@@ -39,7 +39,7 @@ 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, **kw):