dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Revert the try... except, see #960

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

9
eos/gamedata.py
View File

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

18
eos/modifiedAttributeDict.py
View File

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