From e3b592977aa4393c24a8280dda4207b98cc988c8 Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Tue, 13 Dec 2016 23:49:37 -0800 Subject: [PATCH] Make some imports more explicit --- gui/builtinContextMenus/targetResists.py | 4 ++-- gui/pygauge.py | 4 ++-- gui/updateDialog.py | 4 ++-- service/market.py | 20 ++++++++++++++------ 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/gui/builtinContextMenus/targetResists.py b/gui/builtinContextMenus/targetResists.py index 823aa0d82..f23125f43 100644 --- a/gui/builtinContextMenus/targetResists.py +++ b/gui/builtinContextMenus/targetResists.py @@ -3,7 +3,7 @@ import gui.mainFrame import gui.globalEvents as GE import wx from gui.bitmapLoader import BitmapLoader -from service import targetResists as svc_targetResists +from service.targetResists import TargetResists as svc_TargetResists from service.fit import Fit try: @@ -20,7 +20,7 @@ class TargetResists(ContextMenu): if self.mainFrame.getActiveFit() is None or srcContext != "firepowerViewFull": return False - sTR = svc_targetResists.TargetResists.getInstance() + sTR = svc_TargetResists.getInstance() self.patterns = sTR.getTargetResistsList() self.patterns.sort(key=lambda p: (p.name in ["None"], p.name)) diff --git a/gui/pygauge.py b/gui/pygauge.py index 0946e8727..602304e13 100644 --- a/gui/pygauge.py +++ b/gui/pygauge.py @@ -19,7 +19,7 @@ import gui.utils.drawUtils as drawUtils import gui.utils.animEffects as animEffects import gui.utils.fonts as fonts -from service import fit +from service.fit import Fit class PyGauge(wx.PyWindow): @@ -173,7 +173,7 @@ class PyGauge(wx.PyWindow): return self._range def Animate(self): - sFit = fit.Fit.getInstance() + sFit = Fit.getInstance() if sFit.serviceFittingOptions["enableGaugeAnimation"]: if not self._timer: self._timer = wx.Timer(self, self._timerId) diff --git a/gui/updateDialog.py b/gui/updateDialog.py index 4326cfb47..155d5a6a9 100644 --- a/gui/updateDialog.py +++ b/gui/updateDialog.py @@ -19,7 +19,7 @@ import wx import dateutil.parser -from service import settings +from service.settings import UpdateSettings as svc_UpdateSettings class UpdateDialog(wx.Dialog): @@ -27,7 +27,7 @@ class UpdateDialog(wx.Dialog): wx.Dialog.__init__(self, parent, id=wx.ID_ANY, title="Pyfa Update", pos=wx.DefaultPosition, size=wx.Size(400, 300), style=wx.DEFAULT_DIALOG_STYLE) - self.UpdateSettings = settings.UpdateSettings.getInstance() + self.UpdateSettings = svc_UpdateSettings.getInstance() self.releaseInfo = release self.SetSizeHintsSz(wx.DefaultSize, wx.DefaultSize) diff --git a/service/market.py b/service/market.py index c711201b6..8bd49e9cd 100644 --- a/service/market.py +++ b/service/market.py @@ -27,7 +27,8 @@ from sqlalchemy.sql import or_ import config import eos.db -from service import conversions +# TODO: Find out what this is. There is no conversions +# from service import conversions from service.settings import SettingsProvider from service.price import Price @@ -257,9 +258,12 @@ class Market(): "Civilian Light Electron Blaster": True, } + # TODO: Find out what this is. There is no conversions # do not publish ships that we convert + ''' for name in conversions.packs['skinnedShips']: self.ITEMS_FORCEPUBLISHED[name] = False + ''' if config.debug: # Publish Tactical Dessy Modes if in debug @@ -406,11 +410,15 @@ class Market(): item = identity elif isinstance(identity, int): item = eos.db.getItem(identity, *args, **kwargs) - elif isinstance(identity, basestring): - # We normally lookup with string when we are using import/export - # features. Check against overrides - identity = conversions.all.get(identity, identity) - item = eos.db.getItem(identity, *args, **kwargs) + # TODO: Find out what this is. There is no conversions + """ + # Unindent 1 tab + elif isinstance(identity, basestring): + # We normally lookup with string when we are using import/export + # features. Check against overrides + identity = conversions.all.get(identity, identity) + item = eos.db.getItem(identity, *args, **kwargs) + """ elif isinstance(identity, float): id = int(identity) item = eos.db.getItem(id, *args, **kwargs)