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

Add default option to getOriginal. This eliminates some double lookups and simplifies the code.

Browse Source
This commit is contained in:
Ebag333
2017-03-13 10:56:33 -07:00
parent f70d250995
commit b72304203c
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
eos/modifiedAttributeDict.py
View File

@@ -128,7 +128,7 @@ class ModifiedAttributeDict(collections.MutableMapping):
if key in self.__intermediary:
del self.__intermediary[key]
def getOriginal(self, key):
def getOriginal(self, key, default=None):
if self.overrides:
val = self.overrides.get(key, None)
@@ -139,6 +139,9 @@ class ModifiedAttributeDict(collections.MutableMapping):
if self.original:
val = self.original.get(key, None)
if val is None and val != default:
val = default
return val.value if hasattr(val, "value") else val
def __setitem__(self, key, val):
@@ -216,7 +219,7 @@ class ModifiedAttributeDict(collections.MutableMapping):
val = self.__intermediary.get(key,
self.__preAssigns.get(key,
self.getOriginal(key) if key in self.original else default
self.getOriginal(key, default)
)
)

4
gui/itemStats.py
View File

@@ -1043,7 +1043,7 @@ class ItemAffectedBy(wx.Panel):
container = {}
for attrName in attributes.iterAfflictions():
# if value is 0 or there has been no change from original to modified, return
if attributes[attrName] == (attributes.getOriginal(attrName) or 0):
if attributes[attrName] == (attributes.getOriginal(attrName, 0)):
continue
for fit, afflictors in attributes.getAfflictions(attrName).iteritems():
@@ -1170,7 +1170,7 @@ class ItemAffectedBy(wx.Panel):
container = {}
for attrName in attributes.iterAfflictions():
# if value is 0 or there has been no change from original to modified, return
if attributes[attrName] == (attributes.getOriginal(attrName) or 0):
if attributes[attrName] == (attributes.getOriginal(attrName, 0)):
continue
for fit, afflictors in attributes.getAfflictions(attrName).iteritems():