Merge branch 'master' into python3

diff --cc wrw/cookie.py
index c6ae36c64b8daa4aef174a3de9f733f265a6655b,16ddf81ccffccbe258ac37f9c13d9d447e744e21..3a3c9164e427fb765c3331351cb6665a1cdd0685
--- 1/wrw/cookie.py
--- 2/wrw/cookie.py
+++ b/wrw/cookie.py
@@@ -27,9 -27,10 +27,10 @@@ class cookiedict(object)
              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.iteritems():
++        for key, value in kw.items():
+             self.codec[name][key] = value
  
      def __setitem__(self, name, value):
          self.add(name, value)

diff --cc wrw/session.py
Simple merge

diff --cc wrw/sp/util.py
Simple merge