Merge branch 'master' into python3

diff --combined wrw/cookie.py
index c6ae36c,16ddf81..3a3c916
--- 1/wrw/cookie.py
--- 2/wrw/cookie.py
+++ b/wrw/cookie.py
@@@ -1,4 -1,4 +1,4 @@@
 -import Cookie
 +import http.cookies
  
  __all__ = ["cookies", "get", "add"]
  
@@@ -10,10 -10,10 +10,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):
@@@ -27,9 -27,10 +27,10 @@@
              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)
@@@ -40,5 -41,5 +41,5 @@@ def cookies(req)
  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)

diff --combined wrw/session.py
index 90d460b,273775b..d9907cc
--- 1/wrw/session.py
--- 2/wrw/session.py
+++ b/wrw/session.py
@@@ -1,5 -1,5 +1,5 @@@
  import threading, time, pickle, random, os
 -import cookie, env
 +from . import cookie, env
  
  __all__ = ["db", "get"]
  
@@@ -11,7 -11,7 +11,7 @@@ def hexencode(str)
  
  def gennonce(length):
      nonce = ""
 -    for i in xrange(length):
 +    for i in range(length):
          nonce += chr(random.randint(0, 255))
      return nonce
  
@@@ -86,7 -86,7 +86,7 @@@ class db(object)
      def clean(self):
          now = int(time.time())
          with self.lock:
 -            clist = self.live.keys()
 +            clist = list(self.live.keys())
          for sessid in clist:
              with self.lock:
                  try:
@@@ -164,6 -164,12 +164,12 @@@
                  self.cthread.setDaemon(True)
                  self.cthread.start()
  
+     def mksession(self, req):
+         return session(threading.RLock())
+ 
+     def mkcookie(self, req, sess):
+         cookie.add(req, self.cookiename, sess.id, path=self.path)
+ 
      def fetch(self, req):
          now = int(time.time())
          sessid = cookie.get(req, self.cookiename)
@@@ -173,13 -179,13 +179,13 @@@
                  raise KeyError()
              sess = self._fetch(sessid)
          except KeyError:
-             sess = session(threading.RLock())
+             sess = self.mksession(req)
              new = True
  
          def ckfreeze(req):
              if sess.dirty():
                  if new:
-                     cookie.add(req, self.cookiename, sess.id, self.path)
+                     self.mkcookie(req, sess)
                      with self.lock:
                          self.live[sess.id] = [sess.lock, sess]
                  try:
@@@ -196,7 -202,7 +202,7 @@@
          data = self.backdb[sessid]
          try:
              return pickle.loads(data)
 -        except Exception, e:
 +        except:
              raise KeyError()
  
      def freeze(self, sess):

diff --combined wrw/sp/util.py
index 54f9457,795bf57..ba75cac
--- 1/wrw/sp/util.py
--- 2/wrw/sp/util.py
+++ b/wrw/sp/util.py
@@@ -1,4 -1,4 +1,4 @@@
 -import cons
 +from . import cons
  
  def findnsnames(el):
      names = {}
@@@ -6,7 -6,7 +6,7 @@@
      def proc(el):
          if isinstance(el, cons.element):
              if el.ns not in names:
 -                names[el.ns] = u"n" + unicode(nid[0])
 +                names[el.ns] = "n" + str(nid[0])
                  nid[:] = [nid[0] + 1]
              for ch in el.children:
                  proc(ch)
@@@ -32,12 -32,12 +32,12 @@@ class formatter(object)
  
      def quotewrite(self, buf):
          for ch in buf:
 -            if ch == u'&':
 -                self.write(u"&")
 -            elif ch == u'<':
 -                self.write(u"&lt;")
 -            elif ch == u'>':
 -                self.write(u"&gt;")
 +            if ch == '&':
 +                self.write("&amp;")
 +            elif ch == '<':
 +                self.write("&lt;")
 +            elif ch == '>':
 +                self.write("&gt;")
              else:
                  self.write(ch)
  
@@@ -48,15 -48,15 +48,15 @@@
          self.write(el)
  
      def attrval(self, buf):
 -        qc, qt = (u"'", u"&apos;") if u'"' in buf else (u'"', u"&quot;")
 +        qc, qt = ("'", "&apos;") if '"' in buf else ('"', "&quot;")
          self.write(qc)
          for ch in buf:
 -            if ch == u'&':
 -                self.write(u"&amp;")
 -            elif ch == u'<':
 -                self.write(u"&lt;")
 -            elif ch == u'>':
 -                self.write(u"&gt;")
 +            if ch == '&':
 +                self.write("&amp;")
 +            elif ch == '<':
 +                self.write("&lt;")
 +            elif ch == '>':
 +                self.write("&gt;")
              elif ch == qc:
                  self.write(qt)
              else:
@@@ -65,38 -65,38 +65,38 @@@
  
      def attr(self, k, v):
          self.write(k)
 -        self.write(u'=')
 +        self.write('=')
          self.attrval(v)
  
      def shorttag(self, el, **extra):
 -        self.write(u'<' + self.elname(el))
 -        for k, v in el.attrs.iteritems():
 -            self.write(u' ')
 +        self.write('<' + self.elname(el))
 +        for k, v in el.attrs.items():
 +            self.write(' ')
              self.attr(k, v)
 -        for k, v in extra.iteritems():
 -            self.write(u' ')
 +        for k, v in extra.items():
 +            self.write(' ')
              self.attr(k, v)
 -        self.write(u" />")
 +        self.write(" />")
  
      def elname(self, el):
          ns = self.nsnames[el.ns]
          if ns is None:
              return el.name
          else:
 -            return ns + u':' + el.name
 +            return ns + ':' + el.name
  
      def starttag(self, el, **extra):
 -        self.write(u'<' + self.elname(el))
 -        for k, v in el.attrs.iteritems():
 -            self.write(u' ')
 +        self.write('<' + self.elname(el))
 +        for k, v in el.attrs.items():
 +            self.write(' ')
              self.attr(k, v)
 -        for k, v in extra.iteritems():
 -            self.write(u' ')
 +        for k, v in extra.items():
 +            self.write(' ')
              self.attr(k, v)
 -        self.write(u'>')
 +        self.write('>')
  
      def endtag(self, el):
 -        self.write(u'</' + self.elname(el) + u'>')
 +        self.write('</' + self.elname(el) + '>')
  
      def longtag(self, el):
          self.starttag(el, **extra)
@@@ -121,19 -121,19 +121,19 @@@
              raise Exception("Unknown object in element tree: " + el)
  
      def start(self):
 -        self.write(u'<?xml version="1.0" encoding="' + self.charset + u'" ?>\n')
 +        self.write('<?xml version="1.0" encoding="' + self.charset + '" ?>\n')
          if self.doctype:
 -            self.write(u'<!DOCTYPE %s PUBLIC "%s" "%s">\n' % (self.root.name,
 -                                                              self.doctype[0],
 -                                                              self.doctype[1]))
 +            self.write('<!DOCTYPE %s PUBLIC "%s" "%s">\n' % (self.root.name,
 +                                                             self.doctype[0],
 +                                                             self.doctype[1]))
          extra = {}
 -        for uri, nm in self.nsnames.iteritems():
 +        for uri, nm in self.nsnames.items():
              if uri is None:
                  continue
              if nm is None:
 -                extra[u"xmlns"] = uri
 +                extra["xmlns"] = uri
              else:
 -                extra[u"xmlns:" + nm] = uri
 +                extra["xmlns:" + nm] = uri
          self.element(self.root, **extra)
  
      @classmethod
@@@ -142,7 -142,7 +142,7 @@@
  
      @classmethod
      def fragment(cls, out, el, *args, **kw):
-         cls(out=out, root=el, *args, **kw).element(el)
+         cls(out=out, root=el, *args, **kw).node(el)
  
      def update(self, **ch):
          ret = type(self).__new__(type(self))
@@@ -157,9 -157,8 +157,9 @@@ class iwriter(object)
          self.col = 0
  
      def write(self, buf):
 -        for c in buf:
 -            if c == '\n':
 +        for i in range(len(buf)):
 +            c = buf[i:i + 1]
 +            if c == b'\n':
                  self.col = 0
              else:
                  self.col += 1
@@@ -170,16 -169,16 +170,16 @@@
          if self.atbol:
              return
          if self.col != 0:
 -            self.write('\n')
 +            self.write(b'\n')
          self.write(indent)
          self.atbol = True
  
  class indenter(formatter):
 -    def __init__(self, indent=u"  ", *args, **kw):
 +    def __init__(self, indent="  ", *args, **kw):
          super(indenter, self).__init__(*args, **kw)
          self.out = iwriter(self.out)
          self.indent = indent
 -        self.curind = u""
 +        self.curind = ""
  
      def simple(self, el):
          for ch in el.children: