Replaced eos.enum by enum. Removed unused enum import.

Found another Enum to move.

eos/const.py

@@ -17,8 +17,7 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # =============================================================================
 
-from eos.enum import Enum
-from enum import IntEnum,unique
+from enum import Enum,IntEnum,unique,auto
 
 @unique
 class FittingSlot(IntEnum):
@@ -83,6 +82,25 @@ class FittingHardpoint(IntEnum):
     MISSILE = 1
     TURRET = 2
 
+@unique
+class FittingAttrGroup(IntEnum):
+    """
+    Define the various groups of attributes
+    """
+    FITTING = auto()
+    STRUCTURE = auto()
+    SHIELD = auto()
+    ARMOR = auto()
+    TARGETING = auto()
+    EWAR_RESISTS = auto()
+    CAPACITOR = auto()
+    SHARED_FACILITIES = auto()
+    FIGHTER_FACILITIES = auto()
+    ON_DEATH = auto()
+    JUMP_SYSTEMS = auto()
+    PROPULSIONS = auto()
+    FIGHTERS = auto()
+
 @unique
 class EsiLoginMethod(IntEnum):
     """
@@ -126,7 +144,8 @@ class PortEftOptions(IntEnum):
     MUTATIONS = 2
     LOADED_CHARGES = 3
 
-class PortEftRigSize(Enum):
+@unique
+class PortEftRigSize(IntEnum):
     """
     Contains different sizes of ship rigs
     """

eos/enum.py

@@ -1,23 +0,0 @@
-class Enum(object):
-    def __init__(self):
-        pass
-
-    @classmethod
-    def getTypes(cls):
-        for stuff in cls.__dict__:
-            if stuff.upper() == stuff:
-                yield stuff
-
-    @classmethod
-    def getName(cls, v):
-        map = getattr(cls, "_map", None)
-        if map is None:
-            map = cls._map = {}
-            for type in cls.getTypes():
-                map[cls.getValue(type)] = type
-
-        return map.get(v)
-
-    @classmethod
-    def getValue(cls, type):
-        return cls.__dict__[type]

eos/saveddata/fit.py

@@ -28,7 +28,6 @@ from sqlalchemy.orm import validates, reconstructor
 import eos.db
 from eos import capSim
 from eos.effectHandlerHelpers import HandledModuleList, HandledDroneCargoList, HandledImplantBoosterList, HandledProjectedDroneList, HandledProjectedModList
-from eos.enum import Enum
 from eos.const import ImplantLocation, CalcType, FittingSlot
 from eos.saveddata.ship import Ship
 from eos.saveddata.drone import Drone

eos/saveddata/module.py

@@ -25,7 +25,7 @@ from sqlalchemy.orm import reconstructor, validates
 import eos.db
 from eos.const import FittingModuleState, FittingHardpoint, FittingSlot
 from eos.effectHandlerHelpers import HandledCharge, HandledItem
-from eos.enum import Enum
+from enum import Enum
 from eos.modifiedAttributeDict import ChargeAttrShortcut, ItemAttrShortcut, ModifiedAttributeDict
 from eos.saveddata.citadel import Citadel
 from eos.saveddata.mutator import Mutator