Fix keyword-parameter handling bug in formparams.

[wrw.git] / wrw / cookie.py

diff --git a/wrw/cookie.py b/wrw/cookie.py
index c6ae36c..c6e848f 100644 (file)
--- a/wrw/cookie.py
+++ b/wrw/cookie.py
@@ -1,4 +1,5 @@
-import http.cookies
+import http.cookies, time
+from . import proto
 
 __all__ = ["cookies", "get", "add"]
 
@@ -22,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)
@@ -37,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