Revert the try... except, see #960

This commit is contained in:
blitzman
2017-02-08 00:00:16 -05:00
parent b1b3ff2637
commit 8a9d2a032e
2 changed files with 9 additions and 18 deletions

View File

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

View File

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