Merge branch 'master' into python3

Conflicts:
	wrw/sp/cons.py

diff --cc wrw/sp/cons.py
index 205de03,ff0d0af..cb9d451
--- 1/wrw/sp/cons.py
--- 2/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@@ -39,11 -40,14 +40,13 @@@ class element(node)
          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):