Fixed erroneous merge.

[wrw.git] / wrw / cookie.py

diff --git a/wrw/cookie.py b/wrw/cookie.py
index c6e848f..140ba8f 100644 (file)
--- 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):
@@ -30,7 +30,7 @@ class cookiedict(object):
 
     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):