From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 15 Jan 2017 03:24:39 +0000 (+0100)
Subject: Merge branch 'master' of ansgar.seatribe.se:/usr/local/src/wrw
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=5afb31180662cfaf123ae6155a832470c7c6dce2;hp=1273171c643351d41f6d4fbf90f236432d005fc6

Merge branch 'master' of ansgar.seatribe.se:/usr/local/src/wrw

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

diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py
index 4ae21b8..d8b30a8 100644
--- a/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@ -63,12 +63,12 @@ class context(object):
             return
         new = self.nodefrom(child)
         if new is not None:
-            node.children.append(self.nodefrom(child))
+            node.children.append(new)
         elif isinstance(child, collections.Iterable):
             for ch in child:
                 self.addchild(node, ch)
         else:
-            raise Exception("No node conversion known for %s objects" % str(type(ob)))
+            raise Exception("No node conversion known for %s objects" % str(type(child)))
 
     def addattr(self, node, k, v):
         if v is not None: