X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=python%2Fxmltemplate.py;h=182b8e4a3712953d48a572d4183791ef4c3946ea;hb=c00c787ebcd86ec94285b708db96a20286e57ab0;hp=19531496f7d08af8d76df86c515c63cb1dcfe337;hpb=a1cfd19c4c66e6c78740427fc8bb905037b409d9;p=xml-template

diff --git a/python/xmltemplate.py b/python/xmltemplate.py
index 1953149..182b8e4 100644
--- a/python/xmltemplate.py
+++ b/python/xmltemplate.py
@@ -8,7 +8,7 @@ def process_file(filename, obj, clean = True):
 	return doc
 
 def process(node, obj, clean = True):
-	if isinstance(obj, str):			# overwrite
+	if isinstance(obj, basestring):			# overwrite
 		while not node.firstChild is None:
 			node.removeChild(node.firstChild)
 		doc = _get_document_element(node)
@@ -35,8 +35,8 @@ def process(node, obj, clean = True):
 				attrs_to_remove = []
 				if not attrs is None:
 					for i in range(attrs.length):
-						attr = attrs.item(0)
-						if attr.namespaceURI == "http://template.sesse.net/" or attr.name == "id":
+						attr = attrs.item(i)
+						if attr.namespaceURI == "http://template.sesse.net/" and attr.localName == "id":
 							id = attr.value
 							if clean:
 								attrs_to_remove.append(attr.name)
@@ -63,7 +63,7 @@ def process(node, obj, clean = True):
 
 			if not processed:
 				process(child, obj, clean)
-	elif isinstance(obj, list):			# repeat
+	elif hasattr(obj, '__iter__'):			# repeat
 		doc = _get_document_element(node)
 		frag = doc.createElement("temporary-fragment")     # ugh
 
@@ -73,11 +73,12 @@ def process(node, obj, clean = True):
 			frag.appendChild(child)
 
 		for instance in obj:
-			newnode = frag.cloneNode(True)
-			node.appendChild(newnode)
-			process(newnode, instance, clean)
-			if clean:
-				_clean(newnode)
+			if instance is not None:
+				newnode = frag.cloneNode(True)
+				node.appendChild(newnode)
+				process(newnode, instance, clean)
+				if clean:
+					_clean(newnode)
 
 		# remove all the <fragment> tags
 
@@ -99,8 +100,9 @@ def process(node, obj, clean = True):
 def alternate(tag, array, *elems):
 	i = 0
 	for ref in array:
-		ref[tag] = elems[i % len(elems)]
-		i = i + 1
+		if ref is not None:
+			ref[tag] = elems[i % len(elems)]
+			i = i + 1
 		
 	return array