From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 19 Sep 2013 01:21:32 +0000 (+0200)
Subject: Merge branch 'master' into python3
X-Git-Url: http://www.dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=784495582d53f5b759dd216ddd1268fbe2479bb9

Merge branch 'master' into python3

Conflicts:
	wrw/sp/cons.py
---

784495582d53f5b759dd216ddd1268fbe2479bb9
diff --cc wrw/sp/cons.py
index 205de03,ff0d0af..cb9d451
--- a/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):