Changed FittingSlot to IntEnum

service/character.py

@@ -37,7 +37,8 @@ from service.esi import Esi
 
 from eos.saveddata.implant import Implant as es_Implant
 from eos.saveddata.character import Character as es_Character, Skill
-from eos.saveddata.module import FittingSlot as es_Slot, Module as es_Module
+from eos.saveddata.module import Module as es_Module
+from eos.const import FittingSlot as es_Slot
 from eos.saveddata.fighter import Fighter as es_Fighter
 
 pyfalog = Logger(__name__)

service/port/dna.py

@@ -28,8 +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, FittingSlot
+from eos.saveddata.module import Module, FittingModuleState
 from eos.saveddata.ship import Ship
+from eos.const import FittingSlot
 from service.fit import Fit as svcFit
 from service.market import Market
 

service/port/efs.py

@@ -7,11 +7,12 @@ from config import version as pyfaVersion
 from service.fit import Fit
 from service.market import Market
 from eos.enum import Enum
-from eos.saveddata.module import FittingHardpoint, FittingSlot, Module, FittingModuleState
+from eos.saveddata.module import FittingHardpoint,  Module, FittingModuleState
 from eos.saveddata.drone import Drone
 from eos.effectHandlerHelpers import HandledList
 from eos.db import gamedata_session, getCategory, getAttributeInfo, getGroup
 from eos.gamedata import Attribute, Effect, Group, Item, ItemEffect
+from eos.const import FittingSlot
 from eos.utils.spoolSupport import SpoolType, SpoolOptions
 from gui.fitCommands.calc.fitAddModule import FitAddModuleCommand
 from gui.fitCommands.calc.fitRemoveModule import FitRemoveModuleCommand

service/port/eft.py

@@ -32,9 +32,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, FittingSlot
+from eos.saveddata.module import Module, FittingModuleState
 from eos.saveddata.ship import Ship
 from eos.saveddata.fit import Fit
+from eos.const import FittingSlot
 from service.fit import Fit as svcFit
 from service.market import Market
 from service.port.muta import parseMutant, renderMutant
@@ -95,7 +96,7 @@ def exportEft(fit, options):
                     rackLines.append('{}{}{}'.format(modName, modOfflineSuffix, mutationSuffix))
             else:
                 rackLines.append('[Empty {} slot]'.format(
-                    FittingSlot.getName(slotType).capitalize() if slotType is not None else ''))
+                    FittingSlot(slotType).name.capitalize() if slotType is not None else ''))
         if rackLines:
             modSection.append('\n'.join(rackLines))
     if modSection:

service/port/esi.py

@@ -28,7 +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, FittingSlot
+from eos.saveddata.module import Module, FittingModuleState
+from eos.const import FittingSlot
 from eos.saveddata.ship import Ship
 from service.fit import Fit as svcFit
 from service.market import Market

service/port/xml.py

@@ -28,8 +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, FittingSlot
+from eos.saveddata.module import Module, FittingModuleState
 from eos.saveddata.ship import Ship
+from eos.const import FittingSlot
 from service.fit import Fit as svcFit
 from service.market import Market
 from utils.strfunctions import sequential_rep, replace_ltgt
@@ -278,7 +279,7 @@ def exportXml(iportuser, *fits):
 
                 hardware = doc.createElement("hardware")
                 hardware.setAttribute("type", module.item.name)
-                slotName = FittingSlot.getName(slot).lower()
+                slotName = FittingSlot(slot).name.lower()
                 slotName = slotName if slotName != "high" else "hi"
                 hardware.setAttribute("slot", "%s slot %d" % (slotName, slotId))
                 fitting.appendChild(hardware)