git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7bb2b49
)
Fixed a corner case
author
Sapan Bhatia
<sapanb@cs.princeton.edu>
Thu, 9 Jul 2009 22:07:35 +0000
(22:07 +0000)
committer
Sapan Bhatia
<sapanb@cs.princeton.edu>
Thu, 9 Jul 2009 22:07:35 +0000
(22:07 +0000)
sfa/util/rspec.py
patch
|
blob
|
history
diff --git
a/sfa/util/rspec.py
b/sfa/util/rspec.py
index
94ef1ff
..
04c2e52
100644
(file)
--- a/
sfa/util/rspec.py
+++ b/
sfa/util/rspec.py
@@
-91,6
+91,9
@@
class Rspec:
if (nodeDom.hasChildNodes()):
childdict={}
if (nodeDom.hasChildNodes()):
childdict={}
+ for attribute in nodeDom.attributes.keys():
+ siblingdict = self.appendToDictOrCreate(siblingdict, attribute, nodeDom.getAttribute(attribute))
+
for child in nodeDom.childNodes[:-1]:
if (child.nodeValue):
siblingdict = self.appendToDictOrCreate(siblingdict, curNodeName, child.nodeValue)
for child in nodeDom.childNodes[:-1]:
if (child.nodeValue):
siblingdict = self.appendToDictOrCreate(siblingdict, curNodeName, child.nodeValue)
@@
-102,10
+105,9
@@
class Rspec:
siblingdict = self.appendToDictOrCreate(siblingdict, curNodeName, child.nodeValue)
else:
siblingdict = self.toGenDict(child, siblingdict, childdict, curNodeName)
siblingdict = self.appendToDictOrCreate(siblingdict, curNodeName, child.nodeValue)
else:
siblingdict = self.toGenDict(child, siblingdict, childdict, curNodeName)
-
- for attribute in nodeDom.attributes.keys():
- siblingdict = self.appendToDictOrCreate(siblingdict, attribute, nodeDom.getAttribute(attribute))
-
+ else:
+ siblingdict[curNodeName]=[]
+
if (parentdict is not None):
parentdict = self.appendToDictOrCreate(parentdict, parent, siblingdict)
return parentdict
if (parentdict is not None):
parentdict = self.appendToDictOrCreate(parentdict, parent, siblingdict)
return parentdict