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

Fix issues with merge

Browse Source
This commit is contained in:
blitzmann
2017-11-23 11:34:54 -05:00
parent b30b3fcbf1
commit 6e112b9ed5
11 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eos/saveddata/character.py
View File

@@ -342,7 +342,7 @@ class Skill(HandledItem):
elif self.character.name == "All 0":
self.activeLevel = self.__level = 0
elif self.character.alphaClone:
return min(self.activeLevel or 0, self.character.alphaClone.getSkillLevel(self)) or 0
return min(self.activeLevel or 0, self.character.alphaClone.getSkillLevel(self) or 0)
return self.activeLevel or 0

2
gui/builtinItemStatsViews/itemAffectedBy.py
View File

@@ -14,7 +14,7 @@ from eos.saveddata.fit import Fit
import gui.mainFrame
from gui.contextMenu import ContextMenu
from gui.bitmapLoader import BitmapLoader
from gui.bitmap_loader import BitmapLoader
class ItemAffectedBy(wx.Panel):

4
gui/builtinItemStatsViews/itemAttributes.py
View File

@@ -5,9 +5,9 @@ import config
# noinspection PyPackageRequirements
import wx
from helpers import AutoListCtrl
from .helpers import AutoListCtrl
from gui.bitmapLoader import BitmapLoader
from gui.bitmap_loader import BitmapLoader
from service.market import Market
from service.attribute import Attribute
from gui.utils.numberFormatter import formatAmount

2
gui/builtinItemStatsViews/itemCompare.py
View File

@@ -3,7 +3,7 @@ import sys
# noinspection PyPackageRequirements
import wx
from helpers import AutoListCtrl
from .helpers import AutoListCtrl
from service.price import Price as ServicePrice
from service.market import Market
from service.attribute import Attribute

2
gui/builtinItemStatsViews/itemDependants.py
View File

@@ -1,7 +1,7 @@
# noinspection PyPackageRequirements
import wx
from gui.bitmapLoader import BitmapLoader
from gui.bitmap_loader import BitmapLoader
class ItemDependents(wx.Panel):

2
gui/builtinItemStatsViews/itemEffects.py
View File

@@ -6,7 +6,7 @@ import config
# noinspection PyPackageRequirements
import wx
from helpers import AutoListCtrl
from .helpers import AutoListCtrl
class ItemEffects(wx.Panel):

2
gui/builtinItemStatsViews/itemProperties.py
View File

@@ -3,7 +3,7 @@ import sys
# noinspection PyPackageRequirements
import wx
from helpers import AutoListCtrl
from .helpers import AutoListCtrl
class ItemProperties(wx.Panel):

2
gui/builtinItemStatsViews/itemRequirements.py
View File

@@ -1,7 +1,7 @@
# noinspection PyPackageRequirements
import wx
from gui.bitmapLoader import BitmapLoader
from gui.bitmap_loader import BitmapLoader
class ItemRequirements(wx.Panel):

2
gui/builtinPreferenceViews/pyfaGeneralPreferences.py
View File

@@ -91,7 +91,7 @@ class PFGeneralPref(PreferenceView):
priceSizer.Add(self.stDefaultSystem, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
self.chPriceSource = wx.Choice(panel, choices=sorted(Price.sources.keys()))
self.chPriceSystem = wx.Choice(panel, choices=Price.systemsList.keys())
self.chPriceSystem = wx.Choice(panel, choices=list(Price.systemsList.keys()))
priceSizer.Add(self.chPriceSource, 1, wx.ALL | wx.EXPAND, 5)
priceSizer.Add(self.chPriceSystem, 1, wx.ALL | wx.EXPAND, 5)

5
gui/characterEditor.py
View File

@@ -22,7 +22,6 @@ import wx
import wx.dataview
import wx.lib.agw.hyperlink
from utils.floatspin import FloatSpin
# noinspection PyPackageRequirements
import wx.lib.newevent
# noinspection PyPackageRequirements
@@ -346,7 +345,7 @@ class SkillTreeView(wx.Panel):
bSizerButtons.Add(self.btnSecStatus, 0, wx.ALL, 5)
bSizerButtons.AddSpacer((0, 0), 1, wx.EXPAND, 5)
bSizerButtons.AddSpacer(0)
importExport = (("Import", wx.ART_FILE_OPEN, "from"),
("Export", wx.ART_FILE_SAVE_AS, "to"))
@@ -361,7 +360,7 @@ class SkillTreeView(wx.Panel):
btn.Layout()
setattr(self, "{}Btn".format(name.lower()), btn)
btn.Enable(True)
btn.SetToolTipString("%s skills %s clipboard" % (name, direction))
btn.SetToolTip("%s skills %s clipboard" % (name, direction))
bSizerButtons.Add(btn, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_RIGHT | wx.ALL, 5)
btn.Bind(wx.EVT_BUTTON, getattr(self, "{}Skills".format(name.lower())))

2
service/price.py
View File

@@ -105,7 +105,7 @@ class Price(object):
return
# attempt to find user's selected price source, otherwise get first one
sourceCls = cls.sources.get(sFit.serviceFittingOptions["priceSource"], cls.sources[cls.sources.keys()[0]])
sourceCls = cls.sources.get(sFit.serviceFittingOptions["priceSource"], cls.sources[list(cls.sources.keys())[0]])
sourceCls(toRequest, cls.systemsList[sFit.serviceFittingOptions["priceSystem"]], priceMap)
# if we get to this point, then we've got an error. Set to REREQUEST delay