Merge branch 'master' into market_metagroups

service/jargon/loader.py

@@ -43,9 +43,9 @@ class JargonLoader(object):
                 self.jargon_mtime != self._get_jargon_file_mtime())
 
     def _load_jargon(self):
-        jargondata = yaml.load(DEFAULT_DATA, Loader=yaml.FullLoader)
+        jargondata = yaml.load(DEFAULT_DATA, Loader=yaml.SafeLoader)
         with open(JARGON_PATH) as f:
-            userdata = yaml.load(f, Loader=yaml.FullLoader)
+            userdata = yaml.load(f, Loader=yaml.SafeLoader)
         jargondata.update(userdata)
         self.jargon_mtime = self._get_jargon_file_mtime()
         self._jargon = Jargon(jargondata)
@@ -57,7 +57,7 @@ class JargonLoader(object):
 
     @staticmethod
     def init_user_jargon(jargon_path):
-        values = yaml.load(DEFAULT_DATA, Loader=yaml.FullLoader)
+        values = yaml.load(DEFAULT_DATA, Loader=yaml.SafeLoader)
 
         # Disabled for issue/1533; do not overwrite existing user config
         # if os.path.exists(jargon_path):

service/port/efs.py

@@ -523,18 +523,18 @@ class EfsPort:
         tf.mode = fit.mode
         preTraitMultipliers = getCurrentMultipliers(tf)
         for effect in fit.ship.item.effects.values():
-            if effect._Effect__effectModule is not None:
+            if effect.isImplemented:
                 effect.handler(tf, tf.ship, [])
         # Factor in mode effects for T3 Destroyers
         if fit.mode is not None:
             for effect in fit.mode.item.effects.values():
-                if effect._Effect__effectModule is not None:
+                if effect.isImplemented:
                     effect.handler(tf, fit.mode, [])
         if fit.ship.item.groupID == getGroup("Strategic Cruiser").ID:
             subSystems = list(filter(lambda mod: mod.slot == FittingSlot.SUBSYSTEM and mod.item, fit.modules))
             for sub in subSystems:
                 for effect in sub.item.effects.values():
-                    if effect._Effect__effectModule is not None:
+                    if effect.isImplemented:
                         effect.handler(tf, sub, [])
         postTraitMultipliers = getCurrentMultipliers(tf)
         getMaxRatio = lambda dictA, dictB, key: max(map(lambda a, b: b / a, dictA[key], dictB[key]))

service/port/port.py

@@ -76,8 +76,7 @@ class Port(object):
             success = True
             try:
                 iportuser.on_port_process_start()
-                backedUpFits = Port.exportXml(iportuser,
-                                              *svcFit.getInstance().getAllFits())
+                backedUpFits = Port.exportXml(svcFit.getInstance().getAllFits(), iportuser)
                 backupFile = open(path, "w", encoding="utf-8")
                 backupFile.write(backedUpFits)
                 backupFile.close()
@@ -241,10 +240,11 @@ class Port(object):
             return "DNA", (cls.importDna(string),)
 
         # Assume that we import stand-alone abyssal module if all else fails
-        try:
-            return "MutatedItem", (parseMutant(lines),)
-        except:
-            pass
+        if activeFit is not None:
+            try:
+                return "MutatedItem", (parseMutant(lines),)
+            except:
+                pass
 
 
     # EFT-related methods