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:
b8fa261
)
use sfa.util.xml.XML instead of sfa.util.rspec.RecordSpec
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 21 Oct 2011 17:05:52 +0000
(13:05 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 21 Oct 2011 17:05:52 +0000
(13:05 -0400)
sfa/util/record.py
patch
|
blob
|
history
diff --git
a/sfa/util/record.py
b/sfa/util/record.py
index
11f4695
..
0fcef2a
100644
(file)
--- a/
sfa/util/record.py
+++ b/
sfa/util/record.py
@@
-14,6
+14,7
@@
from sfa.trust.gid import *
from sfa.util.parameter import *
from sfa.util.xrn import get_authority
from sfa.util.row import Row
from sfa.util.parameter import *
from sfa.util.xrn import get_authority
from sfa.util.row import Row
+from sfa.util.xml import XML
class SfaRecord(Row):
"""
class SfaRecord(Row):
"""
@@
-303,10
+304,9
@@
class SfaRecord(Row):
"""
recorddict = self.as_dict()
filteredDict = dict([(key, val) for (key, val) in recorddict.iteritems() if key in self.fields.keys()])
"""
recorddict = self.as_dict()
filteredDict = dict([(key, val) for (key, val) in recorddict.iteritems() if key in self.fields.keys()])
- record =
RecordSpec(
)
- record.
parseDict
(filteredDict)
+ record =
XML('<record/>'
)
+ record.
root.attrib.update
(filteredDict)
str = record.toxml()
str = record.toxml()
- #str = xmlrpclib.dumps((dict,), allow_none=True)
return str
##
return str
##
@@
-320,11
+320,8
@@
class SfaRecord(Row):
"""
#dict = xmlrpclib.loads(str)[0][0]
"""
#dict = xmlrpclib.loads(str)[0][0]
- record = RecordSpec()
- record.parseString(str)
- record_dict = record.toDict()
- sfa_dict = record_dict['record']
- self.load_from_dict(sfa_dict)
+ record = XML(str)
+ self.load_from_dict(record.root.attrib)
##
# Dump the record to stdout
##
# Dump the record to stdout