From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 23 Dec 2012 05:00:01 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=26648796c1d6c3c528ad7cdb108ecb086cfa5784;hp=-c

Merge branch 'master' into python3

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

26648796c1d6c3c528ad7cdb108ecb086cfa5784
diff --combined wrw/sp/cons.py
index d54c314,8366cc7..eec2e82
--- a/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@@ -5,32 -5,32 +5,32 @@@ class node(object)
          doc = xml.dom.minidom.Document()
          return self.__todom__(doc).toxml()
  
 -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 = []
  
      def __call__(self, *children, **attrs):
          for child in children:
-             self.children.append(self.ctx.nodefrom(child))
+             self.ctx.addchild(self, child)
 -        for k, v in attrs.iteritems():
 +        for k, v in attrs.items():
-             self.attrs[str(k)] = str(v)
+             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,9 -39,10 +39,9 @@@
  class context(object):
      def __init__(self):
          self.nodeconv = {}
 -        self.nodeconv[str] = lambda ob: text(ob, "utf-8")
 -        self.nodeconv[unicode] = text
 +        self.nodeconv[bytes] = lambda ob: text(ob, "utf-8")
 +        self.nodeconv[str] = text
          self.nodeconv[int] = text
 -        self.nodeconv[long] = text
          self.nodeconv[float] = text
  
      def nodefrom(self, ob):
@@@ -53,6 -54,12 +53,12 @@@
              return self.nodeconv[type(ob)](ob)
          raise Exception("No node conversion known for %s objects" % str(type(ob)))
  
+     def addchild(self, node, child):
+         node.children.append(self.nodefrom(child))
+ 
+     def addattr(self, node, k, v):
 -        node.attrs[unicode(k)] = unicode(v)
++        node.attrs[str(k)] = str(v)
+ 
  class constructor(object):
      def __init__(self, ns, elcls = element, ctx=None):
          self._ns = ns
diff --combined wrw/sp/xhtml.py
index a7debe6,3c6c0f6..17c5678
--- a/wrw/sp/xhtml.py
+++ b/wrw/sp/xhtml.py
@@@ -1,11 -1,11 +1,11 @@@
 -import xml.dom.minidom, StringIO
 -import cons as _cons
 -import util
 +import xml.dom.minidom, io
 +from . import cons as _cons
 +from . import util
  dom = xml.dom.minidom.getDOMImplementation()
  
 -ns = u"http://www.w3.org/1999/xhtml"
 -doctype = u"-//W3C//DTD XHTML 1.1//EN"
 -dtd = u"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"
 +ns = "http://www.w3.org/1999/xhtml"
 +doctype = "-//W3C//DTD XHTML 1.1//EN"
 +dtd = "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"
  
  class htmlelement(_cons.element):
      def __todoc__(self):
@@@ -14,7 -14,15 +14,15 @@@
          doc.appendChild(self.__todom__(doc))
          return doc
  
+ class xhtmlcontext(_cons.context):
 -    attrmap = {u"klass": u"class"}
++    attrmap = {"klass": "class"}
+ 
+     def addattr(self, node, k, v):
 -        k = unicode(k)
 -        node.attrs[self.attrmap.get(k, k)] = unicode(v)
++        k = str(k)
++        node.attrs[self.attrmap.get(k, k)] = str(v)
+ 
  def cons(ctx=None):
+     if ctx is None: ctx = xhtmlcontext()
      return _cons.constructor(ns, htmlelement, ctx)
  
  def head(title=None, css=None):
@@@ -22,7 -30,7 +30,7 @@@
      head = h.head
      if title:
          head(h.title(title))
 -    if isinstance(css, str) or isinstance(css, unicode):
 +    if isinstance(css, str) or isinstance(css, bytes):
          head(h.link(rel="stylesheet", type="text/css", href=css))
      elif css:
          for ss in css:
@@@ -30,7 -38,7 +38,7 @@@
      return head
  
  class htmlformatter(util.formatter):
 -    allowshort = set([u"br", u"hr", u"img", u"input", u"meta", u"link"])
 +    allowshort = set(["br", "hr", "img", "input", "meta", "link"])
      def element(self, el, **extra):
          if el.name in self.allowshort:
              super(htmlformatter, self).element(el, **extra)
@@@ -43,7 -51,7 +51,7 @@@ class htmlindenter(util.indenter, htmlf
  def forreq(req, tree):
      # XXX: Use proper Content-Type for clients accepting it.
      req.ohead["Content-Type"] = "text/html; charset=utf-8"
 -    buf = StringIO.StringIO()
 +    buf = io.BytesIO()
      htmlindenter.output(buf, tree, doctype=(doctype, dtd), charset="utf-8")
      return [buf.getvalue()]