diff --git a/gui/builtinPreferenceViews/pyfaCrestPreferences.py b/gui/builtinPreferenceViews/pyfaCrestPreferences.py index 1891f2216..6e73f4ce6 100644 --- a/gui/builtinPreferenceViews/pyfaCrestPreferences.py +++ b/gui/builtinPreferenceViews/pyfaCrestPreferences.py @@ -4,7 +4,10 @@ from gui.preferenceView import PreferenceView from gui.bitmapLoader import BitmapLoader import gui.mainFrame -from service.crest import Crest + +if 'wxMac' not in wx.PlatformInfo or ('wxMac' in wx.PlatformInfo and wx.VERSION >= (3, 0)): + from service.crest import Crest + from service.settings import CRESTSettings from wx.lib.intctrl import IntCtrl diff --git a/gui/crestFittings.py b/gui/crestFittings.py index c245a739e..e51c0cd26 100644 --- a/gui/crestFittings.py +++ b/gui/crestFittings.py @@ -4,7 +4,9 @@ import json import wx import requests -from service.crest import Crest, CrestModes +if not 'wxMac' in wx.PlatformInfo or ('wxMac' in wx.PlatformInfo and wx.VERSION >= (3,0)): + from service.crest import Crest, CrestModes + from service.port import Port from service.fit import Fit diff --git a/gui/mainFrame.py b/gui/mainFrame.py index a33e34b2d..6570bcfc6 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -60,7 +60,6 @@ from gui import graphFrame from service.settings import SettingsProvider from service.fit import Fit from service.character import Character -from service.crest import Crest from service.update import Update # import this to access override setting @@ -76,6 +75,7 @@ import threading import webbrowser if 'wxMac' not in wx.PlatformInfo or ('wxMac' in wx.PlatformInfo and wx.VERSION >= (3, 0)): + from service.crest import Crest from service.crest import CrestModes from gui.crestFittings import CrestFittings, ExportToEve, CrestMgmt diff --git a/service/port.py b/service/port.py index d8a6600b1..cbd24007d 100644 --- a/service/port.py +++ b/service/port.py @@ -36,7 +36,10 @@ from service.fit import Fit as svcFit import wx from eos.types import State, Slot, Module, Cargo, Ship, Drone, Implant, Booster, Citadel, Fighter, Fit -from service.crest import Crest + +if 'wxMac' not in wx.PlatformInfo or ('wxMac' in wx.PlatformInfo and wx.VERSION >= (3, 0)): + from service.crest import Crest + from service.market import Market logger = logging.getLogger("pyfa.service.port")