Merge branch 'master' into python3

diff --cc wrw/sp/cons.py
index eec2e82,168f297..74a6ea6
--- 1/wrw/sp/cons.py
--- 2/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@@ -1,11 -1,9 +1,9 @@@
  import xml.dom.minidom
  
  class node(object):
-     def __str__(self):
-         doc = xml.dom.minidom.Document()
-         return self.__todom__(doc).toxml()
+     pass
  
 -class text(node, unicode):
 +class text(node, str):
      def __todom__(self, doc):
          return doc.createTextNode(self)