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:
c4c6259
)
apparently, this is allowed:
author
Sapan Bhatia
<sapanb@cs.princeton.edu>
Fri, 10 Jul 2009 02:34:05 +0000
(
02:34
+0000)
committer
Sapan Bhatia
<sapanb@cs.princeton.edu>
Fri, 10 Jul 2009 02:34:05 +0000
(
02:34
+0000)
<a><b/>x</a>
sfa/util/rspec.py
patch
|
blob
|
history
diff --git
a/sfa/util/rspec.py
b/sfa/util/rspec.py
index
3c81b80
..
55fa44e
100644
(file)
--- a/
sfa/util/rspec.py
+++ b/
sfa/util/rspec.py
@@
-91,6
+91,8
@@
class Rspec:
if (nodeDom.hasChildNodes()):
childdict={}
if (nodeDom.hasChildNodes()):
childdict={}
+ for attribute in nodeDom.attributes.keys():
+ childdict = self.appendToDictOrCreate(childdict, 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)
@@
-100,17
+102,16
@@
class Rspec:
child = nodeDom.childNodes[-1]
if (child.nodeValue):
siblingdict = self.appendToDictOrCreate(siblingdict, curNodeName, child.nodeValue)
child = nodeDom.childNodes[-1]
if (child.nodeValue):
siblingdict = self.appendToDictOrCreate(siblingdict, curNodeName, child.nodeValue)
+ if (childdict):
+ siblingdict = self.appendToDictOrCreate(siblingdict, curNodeName, childdict)
else:
siblingdict = self.toDict(child, siblingdict, childdict, curNodeName)
else:
siblingdict = self.toDict(child, siblingdict, childdict, curNodeName)
-
- # Keep the attributes separate from text nodes
- attrdict={}
- for attribute in nodeDom.attributes.keys():
- attrdict = self.appendToDictOrCreate(attrdict, attribute, nodeDom.getAttribute(attribute))
- if (attrdict):
- self.appendToDictOrCreate(siblingdict, curNodeName, attrdict)
else:
else:
- self.appendToDictOrCreate(siblingdict, curNodeName, [])
+ childdict={}
+ for attribute in nodeDom.attributes.keys():
+ childdict = self.appendToDictOrCreate(childdict, attribute, nodeDom.getAttribute(attribute))
+
+ self.appendToDictOrCreate(siblingdict, curNodeName, childdict)
if (parentdict is not None):
parentdict = self.appendToDictOrCreate(parentdict, parent, siblingdict)
if (parentdict is not None):
parentdict = self.appendToDictOrCreate(parentdict, parent, siblingdict)