From 1a0ac7bb352475b840e6194d70fcf06452cb6edd Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Sun, 29 Jan 2017 00:16:15 -0800 Subject: [PATCH] Allow default values to be passed in for modified attributes --- eos/gamedata.py | 4 +--- eos/modifiedAttributeDict.py | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/eos/gamedata.py b/eos/gamedata.py index a23ed0d8a..10317dab2 100644 --- a/eos/gamedata.py +++ b/eos/gamedata.py @@ -246,10 +246,8 @@ class Item(EqBase): def getAttribute(self, key, default=None): if key in self.attributes: return self.attributes[key].value - elif default: - return default else: - return None + return default def isType(self, type): for effect in self.effects.itervalues(): diff --git a/eos/modifiedAttributeDict.py b/eos/modifiedAttributeDict.py index d060eb425..e558dc64d 100644 --- a/eos/modifiedAttributeDict.py +++ b/eos/modifiedAttributeDict.py @@ -25,19 +25,19 @@ cappingAttrKeyCache = {} class ItemAttrShortcut(object): - def getModifiedItemAttr(self, key): + def getModifiedItemAttr(self, key, default=None): if key in self.itemModifiedAttributes: return self.itemModifiedAttributes[key] else: - return None + return default class ChargeAttrShortcut(object): - def getModifiedChargeAttr(self, key): + def getModifiedChargeAttr(self, key, default=None): if key in self.chargeModifiedAttributes: return self.chargeModifiedAttributes[key] else: - return None + return default class ModifiedAttributeDict(collections.MutableMapping):