Unfuck EFT import

eos/modifiedAttributeDict.py

@@ -259,11 +259,7 @@ class ModifiedAttributeDict(collections.MutableMapping):
                 dv = attrInfo.defaultValue
                 default = defaultValuesCache[key] = dv if dv is not None else 0.0
 
-        val = self.__intermediary.get(key,
-                                      self.__preAssigns.get(key,
-                                                            self.getOriginal(key, default)
-                                                            )
-                                      )
+        val = self.__intermediary.get(key, self.__preAssigns.get(key, self.getOriginal(key, default)))
 
         # We'll do stuff in the following order:
         # preIncrease > multiplier > stacking penalized multipliers > postIncrease

service/port/eft.py

@@ -255,7 +255,7 @@ def importEft(lines):
             fit.modules.replaceRackPosition(i, m)
     sFit = svcFit.getInstance()
     sFit.recalc(fit)
-    sFit.fill()
+    sFit.fill(fit)
 
     # Other stuff
     for modRack in (
@@ -459,7 +459,7 @@ def importEftCfg(shipname, lines, iportuser):
             # Recalc to get slot numbers correct for T3 cruisers
             sFit = svcFit.getInstance()
             sFit.recalc(fitobj)
-            sFit.fill()
+            sFit.fill(fitobj)
 
             for module in moduleList:
                 if module.fits(fitobj):