From 9a16c579eb8a098274165f22e98e129ecdc58d1f Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Thu, 14 Mar 2019 12:30:59 -0400 Subject: [PATCH] fixing various imports to point to eos.const instead of old locations --- _development/helpers.py | 3 ++- eos/effects/doomsdayaoeneut.py | 2 +- eos/effects/energyneutralizerfalloff.py | 2 +- eos/effects/entityenergyneutralizerfalloff.py | 2 +- eos/effects/structureenergyneutralizerfalloff.py | 2 +- eos/effects/structurewarpscrambleblockmwdwithnpceffect.py | 2 +- eos/effects/warpdisruptsphere.py | 2 +- eos/effects/warpscrambleblockmwdwithnpceffect.py | 2 +- eos/graph/fitDps.py | 2 +- eos/saveddata/fit.py | 3 ++- gui/builtinAdditionPanes/implantView.py | 2 +- gui/builtinContextMenus/moduleAmmoPicker.py | 2 +- gui/builtinStatsViews/resourcesViewFull.py | 2 +- gui/builtinViewColumns/state.py | 3 ++- gui/fitCommands/calc/fitAddModule.py | 3 ++- gui/fitCommands/calc/fitAddProjectedEnv.py | 3 ++- gui/fitCommands/calc/fitAddProjectedModule.py | 3 ++- gui/fitCommands/calc/fitImportMutatedModule.py | 3 ++- gui/fitCommands/calc/fitReplaceModule.py | 3 ++- gui/fitCommands/guiAddImplant.py | 2 +- service/fit.py | 5 +++-- service/fitDeprecated.py | 3 ++- service/port/dna.py | 4 ++-- service/port/efs.py | 3 ++- service/port/eft.py | 4 ++-- service/port/esi.py | 4 ++-- service/port/port.py | 2 +- service/port/xml.py | 4 ++-- 28 files changed, 44 insertions(+), 33 deletions(-) diff --git a/_development/helpers.py b/_development/helpers.py index 53d44201f..3f4635891 100644 --- a/_development/helpers.py +++ b/_development/helpers.py @@ -129,7 +129,8 @@ def Saveddata(): from eos.saveddata.ship import Ship from eos.saveddata.fit import Fit from eos.saveddata.character import Character - from eos.saveddata.module import Module, FittingModuleState + from eos.saveddata.module import Module + from eos.const import FittingModuleState from eos.saveddata.citadel import Citadel from eos.saveddata.booster import Booster diff --git a/eos/effects/doomsdayaoeneut.py b/eos/effects/doomsdayaoeneut.py index d5263e15b..6f9cd2f5e 100644 --- a/eos/effects/doomsdayaoeneut.py +++ b/eos/effects/doomsdayaoeneut.py @@ -3,7 +3,7 @@ # Used by: # Module: Energy Neutralization Burst Projector # Structure Module: Standup Energy Neutralization Burst Projector -from eos.saveddata.module import FittingModuleState +from eos.const import FittingModuleState from eos.modifiedAttributeDict import ModifiedAttributeDict type = "active", "projected" diff --git a/eos/effects/energyneutralizerfalloff.py b/eos/effects/energyneutralizerfalloff.py index 31f94fa5e..2ee279d44 100644 --- a/eos/effects/energyneutralizerfalloff.py +++ b/eos/effects/energyneutralizerfalloff.py @@ -2,7 +2,7 @@ # # Used by: # Modules from group: Energy Neutralizer (54 of 54) -from eos.saveddata.module import FittingModuleState +from eos.const import FittingModuleState from eos.modifiedAttributeDict import ModifiedAttributeDict type = "active", "projected" diff --git a/eos/effects/entityenergyneutralizerfalloff.py b/eos/effects/entityenergyneutralizerfalloff.py index 8edfe8adf..ade55d190 100644 --- a/eos/effects/entityenergyneutralizerfalloff.py +++ b/eos/effects/entityenergyneutralizerfalloff.py @@ -2,7 +2,7 @@ # # Used by: # Drones from group: Energy Neutralizer Drone (3 of 3) -from eos.saveddata.module import FittingModuleState +from eos.const import FittingModuleState from eos.modifiedAttributeDict import ModifiedAttributeDict type = "active", "projected" diff --git a/eos/effects/structureenergyneutralizerfalloff.py b/eos/effects/structureenergyneutralizerfalloff.py index 73d7db41d..284ed616e 100644 --- a/eos/effects/structureenergyneutralizerfalloff.py +++ b/eos/effects/structureenergyneutralizerfalloff.py @@ -2,7 +2,7 @@ # # Used by: # Structure Modules from group: Structure Energy Neutralizer (5 of 5) -from eos.saveddata.module import FittingModuleState +from eos.const import FittingModuleState from eos.modifiedAttributeDict import ModifiedAttributeDict type = "active", "projected" diff --git a/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py b/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py index abe0c562b..4b342e0ec 100644 --- a/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py +++ b/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py @@ -2,7 +2,7 @@ # # Used by: # Structure Modules from group: Structure Warp Scrambler (2 of 2) -from eos.saveddata.module import FittingModuleState +from eos.const import FittingModuleState # Not used by any item runTime = "early" diff --git a/eos/effects/warpdisruptsphere.py b/eos/effects/warpdisruptsphere.py index e131b9d0c..5a5878fd4 100644 --- a/eos/effects/warpdisruptsphere.py +++ b/eos/effects/warpdisruptsphere.py @@ -7,7 +7,7 @@ # # Used by: # Modules from group: Warp Disrupt Field Generator (7 of 7) -from eos.saveddata.module import FittingModuleState +from eos.const import FittingModuleState type = "projected", "active" runTime = "early" diff --git a/eos/effects/warpscrambleblockmwdwithnpceffect.py b/eos/effects/warpscrambleblockmwdwithnpceffect.py index cf47a4ed9..4b3ee34cb 100644 --- a/eos/effects/warpscrambleblockmwdwithnpceffect.py +++ b/eos/effects/warpscrambleblockmwdwithnpceffect.py @@ -2,7 +2,7 @@ # # Used by: # Modules named like: Warp Scrambler (27 of 27) -from eos.saveddata.module import FittingModuleState +from eos.const import FittingModuleState runTime = "early" type = "projected", "active" diff --git a/eos/graph/fitDps.py b/eos/graph/fitDps.py index 65b855dbd..56f0089e1 100644 --- a/eos/graph/fitDps.py +++ b/eos/graph/fitDps.py @@ -20,7 +20,7 @@ from math import log, sin, radians, exp from eos.graph import Graph -from eos.saveddata.module import FittingModuleState, FittingHardpoint +from eos.const import FittingModuleState, FittingHardpoint from logbook import Logger pyfalog = Logger(__name__) diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py index 028c20379..ff1ee24e2 100644 --- a/eos/saveddata/fit.py +++ b/eos/saveddata/fit.py @@ -33,7 +33,8 @@ from eos.saveddata.ship import Ship from eos.saveddata.drone import Drone from eos.saveddata.character import Character from eos.saveddata.citadel import Citadel -from eos.saveddata.module import Module, FittingModuleState, FittingHardpoint +from eos.const import FittingModuleState, FittingHardpoint +from eos.saveddata.module import Module from eos.utils.stats import DmgTypes from logbook import Logger diff --git a/gui/builtinAdditionPanes/implantView.py b/gui/builtinAdditionPanes/implantView.py index 0b8521cea..9b7f881f8 100644 --- a/gui/builtinAdditionPanes/implantView.py +++ b/gui/builtinAdditionPanes/implantView.py @@ -26,7 +26,7 @@ from gui.builtinViewColumns.state import State from gui.utils.staticHelpers import DragDropHelper from gui.contextMenu import ContextMenu import gui.globalEvents as GE -from eos.saveddata.fit import ImplantLocation +from eos.const import ImplantLocation from service.fit import Fit from service.market import Market import gui.fitCommands as cmd diff --git a/gui/builtinContextMenus/moduleAmmoPicker.py b/gui/builtinContextMenus/moduleAmmoPicker.py index fec9ab4e0..4b4719ecc 100644 --- a/gui/builtinContextMenus/moduleAmmoPicker.py +++ b/gui/builtinContextMenus/moduleAmmoPicker.py @@ -5,7 +5,7 @@ import wx import gui.fitCommands as cmd import gui.mainFrame -from eos.saveddata.module import FittingHardpoint +from eos.const import FittingHardpoint from gui.bitmap_loader import BitmapLoader from gui.contextMenu import ContextMenu from service.market import Market diff --git a/gui/builtinStatsViews/resourcesViewFull.py b/gui/builtinStatsViews/resourcesViewFull.py index 79bc9533c..2ae4fa9dd 100644 --- a/gui/builtinStatsViews/resourcesViewFull.py +++ b/gui/builtinStatsViews/resourcesViewFull.py @@ -26,7 +26,7 @@ import gui.mainFrame from gui.chrome_tabs import EVT_NOTEBOOK_PAGE_CHANGED from gui.utils import fonts -from eos.saveddata.module import FittingHardpoint +from eos.const import FittingHardpoint from gui.utils.numberFormatter import formatAmount diff --git a/gui/builtinViewColumns/state.py b/gui/builtinViewColumns/state.py index 793fbd57e..7c75baccc 100644 --- a/gui/builtinViewColumns/state.py +++ b/gui/builtinViewColumns/state.py @@ -24,7 +24,8 @@ import wx from eos.saveddata.fit import Fit from eos.saveddata.implant import Implant from eos.saveddata.drone import Drone -from eos.saveddata.module import Module, FittingModuleState as State_, Rack +from eos.saveddata.module import Module, Rack +from eos.const import FittingModuleState as State_ from gui.viewColumn import ViewColumn import gui.mainFrame diff --git a/gui/fitCommands/calc/fitAddModule.py b/gui/fitCommands/calc/fitAddModule.py index 4bdf057c7..75611de28 100644 --- a/gui/fitCommands/calc/fitAddModule.py +++ b/gui/fitCommands/calc/fitAddModule.py @@ -1,5 +1,6 @@ import wx -from eos.saveddata.module import Module, FittingModuleState +from eos.saveddata.module import Module +from eos.const import FittingModuleState import eos.db from logbook import Logger from service.fit import Fit diff --git a/gui/fitCommands/calc/fitAddProjectedEnv.py b/gui/fitCommands/calc/fitAddProjectedEnv.py index 90af881a9..87d1bd890 100644 --- a/gui/fitCommands/calc/fitAddProjectedEnv.py +++ b/gui/fitCommands/calc/fitAddProjectedEnv.py @@ -1,5 +1,6 @@ import wx -from eos.saveddata.module import Module, FittingModuleState +from eos.saveddata.module import Module +from eos.const import FittingModuleState import eos.db from logbook import Logger pyfalog = Logger(__name__) diff --git a/gui/fitCommands/calc/fitAddProjectedModule.py b/gui/fitCommands/calc/fitAddProjectedModule.py index 4531ea8b5..089705ba1 100644 --- a/gui/fitCommands/calc/fitAddProjectedModule.py +++ b/gui/fitCommands/calc/fitAddProjectedModule.py @@ -1,7 +1,8 @@ import wx import eos.db from logbook import Logger -from eos.saveddata.module import Module, FittingModuleState +from eos.saveddata.module import Module +from eos.const import FittingModuleState pyfalog = Logger(__name__) diff --git a/gui/fitCommands/calc/fitImportMutatedModule.py b/gui/fitCommands/calc/fitImportMutatedModule.py index b5e323d0e..bae0ef0d8 100644 --- a/gui/fitCommands/calc/fitImportMutatedModule.py +++ b/gui/fitCommands/calc/fitImportMutatedModule.py @@ -1,5 +1,6 @@ import wx -from eos.saveddata.module import Module, FittingModuleState +from eos.saveddata.module import Module +from eos.const import FittingModuleState import eos.db from eos.db.gamedata.queries import getDynamicItem from logbook import Logger diff --git a/gui/fitCommands/calc/fitReplaceModule.py b/gui/fitCommands/calc/fitReplaceModule.py index 3ccf371e7..b2d36314c 100644 --- a/gui/fitCommands/calc/fitReplaceModule.py +++ b/gui/fitCommands/calc/fitReplaceModule.py @@ -2,7 +2,8 @@ import wx from logbook import Logger import eos.db -from eos.saveddata.module import Module, FittingModuleState +from eos.saveddata.module import Module +from eos.const import FittingModuleState from gui.fitCommands.helpers import ModuleInfoCache pyfalog = Logger(__name__) diff --git a/gui/fitCommands/guiAddImplant.py b/gui/fitCommands/guiAddImplant.py index 79b75f014..52b284071 100644 --- a/gui/fitCommands/guiAddImplant.py +++ b/gui/fitCommands/guiAddImplant.py @@ -3,7 +3,7 @@ from service.fit import Fit import gui.mainFrame from gui import globalEvents as GE -from eos.saveddata.fit import ImplantLocation +from eos.const import ImplantLocation from .calc.fitAddImplant import FitAddImplantCommand from .calc.fitChangeImplantLocation import FitChangeImplantLocation diff --git a/service/fit.py b/service/fit.py index 44686dc00..48085e745 100644 --- a/service/fit.py +++ b/service/fit.py @@ -30,8 +30,9 @@ from eos.saveddata.citadel import Citadel as es_Citadel from eos.saveddata.damagePattern import DamagePattern as es_DamagePattern from eos.saveddata.drone import Drone as es_Drone from eos.saveddata.fighter import Fighter as es_Fighter -from eos.saveddata.fit import Fit as FitType, ImplantLocation -from eos.saveddata.module import Module as es_Module, FittingModuleState +from eos.const import ImplantLocation, FittingModuleState +from eos.saveddata.fit import Fit as FitType +from eos.saveddata.module import Module as es_Module from eos.saveddata.ship import Ship as es_Ship from service.character import Character from service.damagePattern import DamagePattern diff --git a/service/fitDeprecated.py b/service/fitDeprecated.py index 0e1569deb..138da90e6 100644 --- a/service/fitDeprecated.py +++ b/service/fitDeprecated.py @@ -27,7 +27,8 @@ from eos.saveddata.cargo import Cargo as es_Cargo from eos.saveddata.drone import Drone as es_Drone from eos.saveddata.fighter import Fighter as es_Fighter from eos.saveddata.implant import Implant as es_Implant -from eos.saveddata.module import Module as es_Module, FittingModuleState +from eos.saveddata.module import Module as es_Module +from eos.const import FittingModuleState from eos.saveddata.fit import Fit as FitType from utils.deprecated import deprecated diff --git a/service/port/dna.py b/service/port/dna.py index 8c383fb82..27b088e29 100644 --- a/service/port/dna.py +++ b/service/port/dna.py @@ -28,9 +28,9 @@ from eos.saveddata.citadel import Citadel from eos.saveddata.drone import Drone from eos.saveddata.fighter import Fighter from eos.saveddata.fit import Fit -from eos.saveddata.module import Module, FittingModuleState +from eos.saveddata.module import Module from eos.saveddata.ship import Ship -from eos.const import FittingSlot +from eos.const import FittingSlot, FittingModuleState from service.fit import Fit as svcFit from service.market import Market diff --git a/service/port/efs.py b/service/port/efs.py index 5c0a5219f..b42d803f9 100755 --- a/service/port/efs.py +++ b/service/port/efs.py @@ -6,7 +6,8 @@ from numbers import Number from config import version as pyfaVersion from service.fit import Fit from service.market import Market -from eos.saveddata.module import FittingHardpoint, Module, FittingModuleState +from eos.const import FittingModuleState, FittingHardpoint +from eos.saveddata.module import Module from eos.saveddata.drone import Drone from eos.effectHandlerHelpers import HandledList from eos.db import gamedata_session, getCategory, getAttributeInfo, getGroup diff --git a/service/port/eft.py b/service/port/eft.py index 66b6aaba9..b5eba1bc5 100644 --- a/service/port/eft.py +++ b/service/port/eft.py @@ -30,10 +30,10 @@ from eos.saveddata.booster import Booster from eos.saveddata.drone import Drone from eos.saveddata.fighter import Fighter from eos.saveddata.implant import Implant -from eos.saveddata.module import Module, FittingModuleState +from eos.saveddata.module import Module from eos.saveddata.ship import Ship from eos.saveddata.fit import Fit -from eos.const import FittingSlot +from eos.const import FittingSlot, FittingModuleState from service.fit import Fit as svcFit from service.market import Market from service.port.muta import parseMutant, renderMutant diff --git a/service/port/esi.py b/service/port/esi.py index c9c8ed708..80a940c88 100644 --- a/service/port/esi.py +++ b/service/port/esi.py @@ -28,8 +28,8 @@ from eos.saveddata.citadel import Citadel from eos.saveddata.drone import Drone from eos.saveddata.fighter import Fighter from eos.saveddata.fit import Fit -from eos.saveddata.module import Module, FittingModuleState -from eos.const import FittingSlot +from eos.saveddata.module import Module +from eos.const import FittingSlot, FittingModuleState from eos.saveddata.ship import Ship from service.fit import Fit as svcFit from service.market import Market diff --git a/service/port/port.py b/service/port/port.py index 8038cab8e..69c512646 100644 --- a/service/port/port.py +++ b/service/port/port.py @@ -29,7 +29,7 @@ from bs4 import UnicodeDammit from logbook import Logger from eos import db -from eos.saveddata.fit import ImplantLocation +from eos.const import ImplantLocation from service.fit import Fit as svcFit from service.port.dna import exportDna, importDna from service.port.eft import exportEft, importEft, importEftCfg diff --git a/service/port/xml.py b/service/port/xml.py index 7fcb05117..39fce6994 100644 --- a/service/port/xml.py +++ b/service/port/xml.py @@ -28,9 +28,9 @@ from eos.saveddata.citadel import Citadel from eos.saveddata.drone import Drone from eos.saveddata.fighter import Fighter from eos.saveddata.fit import Fit -from eos.saveddata.module import Module, FittingModuleState +from eos.saveddata.module import Module from eos.saveddata.ship import Ship -from eos.const import FittingSlot +from eos.const import FittingSlot, FittingModuleState from service.fit import Fit as svcFit from service.market import Market from utils.strfunctions import sequential_rep, replace_ltgt