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:
7b91bd4
)
check if record has pl_info/geni_info before trying to access it
author
Tony Mack
<tmack@cs.princeton.edu>
Fri, 3 Apr 2009 02:02:15 +0000
(
02:02
+0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Fri, 3 Apr 2009 02:02:15 +0000
(
02:02
+0000)
geni/util/record.py
patch
|
blob
|
history
diff --git
a/geni/util/record.py
b/geni/util/record.py
index
589b9a3
..
72d54c8
100644
(file)
--- a/
geni/util/record.py
+++ b/
geni/util/record.py
@@
-248,9
+248,9
@@
class GeniRecord:
self.set_type(dict['type'])
self.set_pointer(dict['pointer'])
self.set_type(dict['type'])
self.set_pointer(dict['pointer'])
- if "pl_info" in dict:
+ if "pl_info" in dict
and dict['pl_info']
:
self.set_pl_info(dict["pl_info"])
self.set_pl_info(dict["pl_info"])
- if "geni_info" in dict:
+ if "geni_info" in dict
and dict['geni_info']
:
self.set_geni_info(dict["geni_info"])
##
self.set_geni_info(dict["geni_info"])
##
@@
-311,6
+311,10
@@
class GeniRecord:
def getdict(self):
info = {'hrn': self.name, 'type': self.type, 'gid': self.gid}
def getdict(self):
info = {'hrn': self.name, 'type': self.type, 'gid': self.gid}
- info.update(getattr(self, "geni_info", {}))
- info.update(getattr(self, "pl_info", {}))
+ geni_info = getattr(self, "geni_info", {})
+ pl_info = getattr(self, "pl_info", {})
+ if geni_info:
+ info.update(geni_info)
+ if pl_info:
+ info.update(pl_info)
return info
return info