From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 5 Apr 2016 21:30:44 +0000 (+0200)
Subject: Merge branch 'master' of ansgar.seatribe.se:/usr/local/src/wrw
X-Git-Url: http://www.dolda2000.com/gitweb/?a=commitdiff_plain;h=8f69f74e2a2a1b4531b6cef1bb5c203ca75d88d7;hp=e1e1218fd66230e4ac8c7fca36a4c9a7b2496cf5;p=wrw.git

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

diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py
index 0c36458..8ffa397 100644
--- a/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@ -1,4 +1,4 @@
-import sys
+import sys, collections.abc
 import xml.dom.minidom
 
 class node(object):
@@ -56,12 +56,19 @@ class context(object):
             return ob.__tonode__()
         if type(ob) in self.nodeconv:
             return self.nodeconv[type(ob)](ob)
-        raise Exception("No node conversion known for %s objects" % str(type(ob)))
+        return None
 
     def addchild(self, node, child):
         if child is None:
             return
-        node.children.append(self.nodefrom(child))
+        new = self.nodefrom(child)
+        if new is not None:
+            node.children.append(self.nodefrom(child))
+        elif isinstance(child, collections.abc.Iterable):
+            for ch in child:
+                self.addchild(node, ch)
+        else:
+            raise Exception("No node conversion known for %s objects" % str(type(ob)))
 
     def addattr(self, node, k, v):
         if v is not None: