More fixes for NNNL reporting

jpn-- · Jan 20, 2017 · 78d3a79 · 78d3a79
1 parent f53d69c
commit 78d3a79
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/py/test/test_nl.py b/py/test/test_nl.py
@@ -791,8 +791,11 @@ def test_nnnl(self):
 		 'nesting_tree',
 		 '&', ]
 		# make sure no errors are raised in reporting
-		m.xhtml(*cats)
-		m.xhtml('*')
+		import warnings
+		with warnings.catch_warnings():
+			warnings.filterwarnings('ignore')
+			m.xhtml(*cats)
+			m.xhtml('*')
 
 
 	def test_nnnl_quant(self):

diff --git a/py/util/xhtml.py b/py/util/xhtml.py
@@ -118,7 +118,13 @@ def append(self, arg):
 		if isinstance(arg, XML_Builder):
 			super().append(arg.close())   
 		else:
-			super().append(arg)   
+			try:
+				super().append(arg)
+			except TypeError:
+				if callable(arg):
+					super().append(arg())
+				else:
+					raise
 	def __lshift__(self,other):
 		if other is not None:
 			self.append(other)