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:
02a70ef
)
More corner cases.
author
Sapan Bhatia
<sapanb@cs.princeton.edu>
Thu, 9 Jul 2009 23:05:59 +0000
(23:05 +0000)
committer
Sapan Bhatia
<sapanb@cs.princeton.edu>
Thu, 9 Jul 2009 23:05:59 +0000
(23:05 +0000)
sfa/util/rspec.py
patch
|
blob
|
history
diff --git
a/sfa/util/rspec.py
b/sfa/util/rspec.py
index
902733c
..
2b1fe85
100644
(file)
--- a/
sfa/util/rspec.py
+++ b/
sfa/util/rspec.py
@@
-1,6
+1,7
@@
### $Id$
### $URL$
### $Id$
### $URL$
+import pdb
import sys
import pprint
import os
import sys
import pprint
import os
@@
-91,9
+92,6
@@
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)
@@
-105,8
+103,15
@@
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)
+
+ # 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:
- s
iblingdict[curNodeName]=[]
+ s
elf.appendToDictOrCreate(siblingdict, curNodeName, [])
if (parentdict is not None):
parentdict = self.appendToDictOrCreate(parentdict, parent, siblingdict)
if (parentdict is not None):
parentdict = self.appendToDictOrCreate(parentdict, parent, siblingdict)