Merge branch 'master' into python3

Conflicts:
	wrw/sp/cons.py

diff --combined wrw/sp/cons.py
index 205de03,ff0d0af..cb9d451
--- 1/wrw/sp/cons.py
--- 2/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@@ -1,20 -1,21 +1,21 @@@
+ import sys
  import xml.dom.minidom
  
  class node(object):
      pass
  
 -class text(node, unicode):
 +class text(node, str):
      def __todom__(self, doc):
          return doc.createTextNode(self)
  
 -class raw(node, unicode):
 +class raw(node, str):
      def __todom__(self, doc):
          raise Exception("Cannot convert raw code to DOM objects")
  
  class element(node):
      def __init__(self, ns, name, ctx):
          self.ns = ns
 -        self.name = unicode(name)
 +        self.name = str(name)
          self.ctx = ctx
          self.attrs = {}
          self.children = []
@@@ -22,13 -23,13 +23,13 @@@
      def __call__(self, *children, **attrs):
          for child in children:
              self.ctx.addchild(self, child)
 -        for k, v in attrs.iteritems():
 +        for k, v in attrs.items():
              self.ctx.addattr(self, k, v)
          return self
  
      def __todom__(self, doc):
          el = doc.createElementNS(self.ns, self.name)
 -        for k, v in self.attrs.iteritems():
 +        for k, v in self.attrs.items():
              el.setAttribute(k, v)
          for child in self.children:
              el.appendChild(child.__todom__(doc))
@@@ -39,11 -40,14 +40,13 @@@
          return self.__todom__(doc).toxml()
  
  class context(object):
+     charset = sys.getfilesystemencoding()
+ 
      def __init__(self):
          self.nodeconv = {}
-         self.nodeconv[bytes] = lambda ob: text(ob, "utf-8")
 -        self.nodeconv[str] = lambda ob: text(ob, self.charset)
 -        self.nodeconv[unicode] = text
++        self.nodeconv[bytes] = lambda ob: text(ob, self.charset)
 +        self.nodeconv[str] = text
          self.nodeconv[int] = text
 -        self.nodeconv[long] = text
          self.nodeconv[float] = text
  
      def nodefrom(self, ob):
@@@ -60,7 -64,7 +63,7 @@@
  
      def addattr(self, node, k, v):
          if v is not None:
 -            node.attrs[unicode(k)] = unicode(v)
 +            node.attrs[str(k)] = str(v)
  
  class constructor(object):
      def __init__(self, ns, elcls=element, ctx=None):