oh god this isn't gonna work

Merge branch 'ebag_importchanges' into test_import

Conflicts:
	config.py
	eos/db/saveddata/queries.py
	eos/effects/chargebonuswarfarecharge.py
	eos/effects/elitebonuscommandshipinformationhiddencs3.py
	eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py
	eos/effects/energydestabilizationnew.py
	eos/effects/iceharvestingdroneoperationdurationbonus.py
	eos/effects/miningforemanstrengthbonus.py
	eos/effects/modulebonuswarfarelinkarmor.py
	eos/effects/modulebonuswarfarelinkinfo.py
	eos/effects/modulebonuswarfarelinkmining.py
	eos/effects/modulebonuswarfarelinkshield.py
	eos/effects/modulebonuswarfarelinkskirmish.py
	eos/effects/moduletitaneffectgenerator.py
	eos/effects/remotehullrepair.py
	eos/effects/rolebonusremotearmorrepairoptimalfalloff.py
	eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
	eos/effects/shipmodesmallmissiledamagepostdiv.py
	eos/effects/structureenergyneutralizerfalloff.py
	eos/effects/structuremoduleeffectstasiswebifier.py
	eos/effects/structurerigmaxtargets.py
	eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
	eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
	eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
	eos/effects/techtwocommandburstbonus.py
	eos/saveddata/fighter.py
	eos/saveddata/fit.py
	eos/saveddata/module.py
	eve.db
	gui/bitmapLoader.py
	gui/builtinContextMenus/itemStats.py
	gui/builtinStatsViews/miningyieldViewFull.py
	gui/builtinViewColumns/misc.py
	gui/builtinViews/__init__.py
	gui/builtinViews/fittingView.py
	gui/contextMenu.py
	gui/graphFrame.py
	gui/itemStats.py
	gui/mainFrame.py
	gui/marketBrowser.py
	service/__init__.py
	service/character.py
	service/fit.py
	service/port.py
	service/prefetch.py
	service/pycrest/eve.py
	service/settings.py

eos/saveddata/booster.py

@@ -159,6 +159,7 @@ class Booster(HandledItem, ItemAttrShortcut):
 
         return copy
 
+
 # Legacy booster side effect code, disabling as not currently implemented
 '''
     class SideEffect(object):
@@ -194,4 +195,4 @@ class Booster(HandledItem, ItemAttrShortcut):
                 raise TypeError("Need an effect with a handler")
 
             self.__effect = effect
-'''
+'''

eos/saveddata/fighter.py

@@ -273,8 +273,7 @@ class Fighter(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
         for ability in self.abilities:
             if ability.active:
                 effect = ability.effect
-                if effect.runTime == runTime and \
-                effect.activeByDefault and \
+                if effect.runTime == runTime and effect.activeByDefault and \
                         ((projected and effect.isType("projected")) or not projected):
                     if ability.grouped:
                         effect.handler(fit, self, context)

eos/saveddata/fighterAbility.py

@@ -95,14 +95,12 @@ class FighterAbility(object):
 
     @property
     def reloadTime(self):
-        return self.fighter.getModifiedItemAttr("fighterRefuelingTime") + \
-               (self.REARM_TIME_MAPPING[self.fighter.getModifiedItemAttr(
-                   "fighterSquadronRole")] or 0 if self.hasCharges else 0) * self.numShots
+        rearm_time = (self.REARM_TIME_MAPPING[self.fighter.getModifiedItemAttr("fighterSquadronRole")] or 0 if self.hasCharges else 0)
+        return self.fighter.getModifiedItemAttr("fighterRefuelingTime") + rearm_time * self.numShots
 
     @property
     def numShots(self):
-        return self.NUM_SHOTS_MAPPING[
-                   self.fighter.getModifiedItemAttr("fighterSquadronRole")] or 0 if self.hasCharges else 0
+        return self.NUM_SHOTS_MAPPING[self.fighter.getModifiedItemAttr("fighterSquadronRole")] or 0 if self.hasCharges else 0
 
     @property
     def cycleTime(self):

eos/saveddata/fit.py

@@ -28,10 +28,12 @@ from sqlalchemy.orm import validates, reconstructor
 import eos.db
 from eos import capSim
 from eos.effectHandlerHelpers import *
+from eos.effectHandlerHelpers import HandledModuleList, HandledDroneCargoList, HandledImplantBoosterList, HandledProjectedDroneList, HandledProjectedModList
 from eos.enum import Enum
 from eos.saveddata.module import State, Hardpoint
 from eos.types import Ship, Character, Slot, Module, Citadel
 from utils.timer import Timer
+import logging
 
 logger = logging.getLogger(__name__)
 
@@ -740,7 +742,7 @@ class Fit(object):
             if not withBoosters and self.commandBonuses:
                 self.__runCommandBoosts(runTime)
 
-            timer.checkpoint('Done with runtime: %s'%runTime)
+            timer.checkpoint('Done with runtime: %s' % runTime)
 
         # Mark fit as calculated
         self.__calculated = True

eos/saveddata/targetResists.py

@@ -77,7 +77,12 @@ class TargetResists(object):
         out += "# TargetResists = [name],[EM %],[Thermal %],[Kinetic %],[Explosive %]\n\n"
         for dp in patterns:
             out += cls.EXPORT_FORMAT % (
-            dp.name, dp.emAmount * 100, dp.thermalAmount * 100, dp.kineticAmount * 100, dp.explosiveAmount * 100)
+                dp.name,
+                dp.emAmount * 100,
+                dp.thermalAmount * 100,
+                dp.kineticAmount * 100,
+                dp.explosiveAmount * 100
+            )
 
         return out.strip()