diff --git a/eos/db/migrations/upgrade25.py b/eos/db/migrations/upgrade25.py index bf334c37d..3143480af 100644 --- a/eos/db/migrations/upgrade25.py +++ b/eos/db/migrations/upgrade25.py @@ -4204,7 +4204,7 @@ conversion2 = { def upgrade(saveddata_engine): # First we want to get a list of fittings that are completely fitted out with subsystems - oldItems = [str(x) for x in conversion2.iterkeys()] + oldItems = [str(x) for x in conversion2.keys()] # I can't figure out a way to get IN operator to work when supplying a list using a parameterized query. So I'm # doing it the shitty way by formatting the SQL string. Don't do this kids! diff --git a/gui/builtinItemStatsViews/itemAttributes.py b/gui/builtinItemStatsViews/itemAttributes.py index 36bb5e9c7..39152e566 100644 --- a/gui/builtinItemStatsViews/itemAttributes.py +++ b/gui/builtinItemStatsViews/itemAttributes.py @@ -166,7 +166,7 @@ class ItemParams(wx.Panel): self.imageList = wx.ImageList(16, 16) self.paramList.SetImageList(self.imageList, wx.IMAGE_LIST_SMALL) - names = list(self.attrValues.iterkeys()) + names = list(self.attrValues.keys()) names.sort() idNameMap = {} diff --git a/gui/builtinItemStatsViews/itemDescription.py b/gui/builtinItemStatsViews/itemDescription.py index c94bd2b66..ddf30dfb4 100644 --- a/gui/builtinItemStatsViews/itemDescription.py +++ b/gui/builtinItemStatsViews/itemDescription.py @@ -11,8 +11,8 @@ class ItemDescription(wx.Panel): mainSizer = wx.BoxSizer(wx.VERTICAL) self.SetSizer(mainSizer) - bgcolor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW) - fgcolor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOWTEXT) + bgcolor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW) + fgcolor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT) self.description = wx.html.HtmlWindow(self) diff --git a/gui/builtinItemStatsViews/itemEffects.py b/gui/builtinItemStatsViews/itemEffects.py index 75a795e1d..0b7db9a2e 100644 --- a/gui/builtinItemStatsViews/itemEffects.py +++ b/gui/builtinItemStatsViews/itemEffects.py @@ -47,7 +47,7 @@ class ItemEffects(wx.Panel): item = self.item effects = item.effects - names = list(effects.iterkeys()) + names = list(effects.keys()) names.sort() for name in names: