dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

fixing various imports to point to eos.const instead of old locations

Browse Source
This commit is contained in:
Ryan Holmes
2019-03-14 12:30:59 -04:00
parent 8b864692fb
commit 9a16c579eb
28 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
_development/helpers.py
View File

@@ -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

2
eos/effects/doomsdayaoeneut.py
View File

@@ -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"

2
eos/effects/energyneutralizerfalloff.py
View File

@@ -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"

2
eos/effects/entityenergyneutralizerfalloff.py
View File

@@ -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"

2
eos/effects/structureenergyneutralizerfalloff.py
View File

@@ -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"

2
eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
View File

@@ -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"

2
eos/effects/warpdisruptsphere.py
View File

@@ -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"

2
eos/effects/warpscrambleblockmwdwithnpceffect.py
View File

@@ -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"

2
eos/graph/fitDps.py
View File

@@ -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__)

3
eos/saveddata/fit.py
View File

@@ -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

2
gui/builtinAdditionPanes/implantView.py
View File

@@ -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

2
gui/builtinContextMenus/moduleAmmoPicker.py
View File

@@ -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

2
gui/builtinStatsViews/resourcesViewFull.py
View File

@@ -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

3
gui/builtinViewColumns/state.py
View File

@@ -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

3
gui/fitCommands/calc/fitAddModule.py
View File

@@ -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

3
gui/fitCommands/calc/fitAddProjectedEnv.py
View File

@@ -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__)

3
gui/fitCommands/calc/fitAddProjectedModule.py
View File

@@ -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__)

3
gui/fitCommands/calc/fitImportMutatedModule.py
View File

@@ -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

3
gui/fitCommands/calc/fitReplaceModule.py
View File

@@ -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__)

2
gui/fitCommands/guiAddImplant.py
View File

@@ -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

5
service/fit.py
View File

@@ -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

3
service/fitDeprecated.py
View File

@@ -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

4
service/port/dna.py
View File

@@ -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

3
service/port/efs.py
View File

@@ -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

4
service/port/eft.py
View File

@@ -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

4
service/port/esi.py
View File

@@ -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

2
service/port/port.py
View File

@@ -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

4
service/port/xml.py
View File

@@ -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