Wrap getting attribute data in a try/except

Useful for when we try to get an sub-attribute on an object where the
attribute doesn't exist. Now returns the default value.
This commit is contained in:
Ebag333
2017-01-29 00:27:45 -08:00
parent e524197a4d
commit 1ebd54b282
2 changed files with 18 additions and 9 deletions

View File

@@ -244,9 +244,12 @@ class Item(EqBase):
return self.__attributes
def getAttribute(self, key, default=None):
if key in self.attributes:
return self.attributes[key].value
else:
try:
if key in self.attributes:
return self.attributes[key].value
else:
return default
except AttributeError:
return default
def isType(self, type):

View File

@@ -26,17 +26,23 @@ cappingAttrKeyCache = {}
class ItemAttrShortcut(object):
def getModifiedItemAttr(self, key, default=None):
if key in self.itemModifiedAttributes:
return self.itemModifiedAttributes[key]
else:
try:
if key in self.itemModifiedAttributes:
return self.itemModifiedAttributes[key]
else:
return default
except AttributeError:
return default
class ChargeAttrShortcut(object):
def getModifiedChargeAttr(self, key, default=None):
if key in self.chargeModifiedAttributes:
return self.chargeModifiedAttributes[key]
else:
try:
if key in self.chargeModifiedAttributes:
return self.chargeModifiedAttributes[key]
else:
return default
except AttributeError:
return default