Resolve #222 (Use of ordered dicts in gui bumped python requirement to 2.7)
This commit is contained in:
@@ -20,11 +20,15 @@
|
||||
import os.path
|
||||
import config
|
||||
import wx
|
||||
import collections
|
||||
import time
|
||||
|
||||
try:
|
||||
from collections import OrderedDict
|
||||
except ImportError:
|
||||
from compat import OrderedDict
|
||||
|
||||
cachedBitmapsCount = 0
|
||||
cachedBitmaps = collections.OrderedDict()
|
||||
cachedBitmaps = OrderedDict()
|
||||
dontUseCachedBitmaps = False
|
||||
|
||||
def getStaticBitmap(name, parent, location):
|
||||
|
||||
@@ -3,11 +3,15 @@ import copy
|
||||
from gui import bitmapLoader
|
||||
import gui.mainFrame
|
||||
import service
|
||||
import collections
|
||||
|
||||
from wx.lib.buttons import GenBitmapButton
|
||||
from pickle import TRUE
|
||||
|
||||
try:
|
||||
from collections import OrderedDict
|
||||
except ImportError:
|
||||
from compat import OrderedDict
|
||||
|
||||
FitRenamed, EVT_FIT_RENAMED = wx.lib.newevent.NewEvent()
|
||||
FitSelected, EVT_FIT_SELECTED = wx.lib.newevent.NewEvent()
|
||||
FitRemoved, EVT_FIT_REMOVED = wx.lib.newevent.NewEvent()
|
||||
@@ -26,9 +30,9 @@ class ShipBrowser(wx.Panel):
|
||||
self.browseHist = []
|
||||
self.lastStage = (0,0)
|
||||
|
||||
self.stage1Cache = collections.OrderedDict()
|
||||
self.stage2Cache = collections.OrderedDict()
|
||||
self.stage3Cache = collections.OrderedDict()
|
||||
self.stage1Cache = OrderedDict()
|
||||
self.stage2Cache = OrderedDict()
|
||||
self.stage3Cache = OrderedDict()
|
||||
|
||||
self._stage1Data = -1
|
||||
self._stage2Data = -1
|
||||
|
||||
Reference in New Issue
Block a user