From 707f7b96c09fc27ad3096ee6abe0dc8cf91db05a Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Fri, 3 Apr 2009 02:02:15 +0000 Subject: [PATCH] check if record has pl_info/geni_info before trying to access it --- geni/util/record.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/geni/util/record.py b/geni/util/record.py index 589b9a3c..72d54c88 100644 --- 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']) - if "pl_info" in dict: + if "pl_info" in dict and 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"]) ## @@ -311,6 +311,10 @@ class GeniRecord: 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 -- 2.43.0