Merge branch 'master' into python3

diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py
index 99656a3..3b6ec2c 100644 (file)
--- a/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@ -59,6 +59,8 @@ class context(object):
         raise Exception("No node conversion known for %s objects" % str(type(ob)))
 
     def addchild(self, node, child):
+        if child is None:
+            return
         node.children.append(self.nodefrom(child))
 
     def addattr(self, node, k, v):