From 956fa7a8b71af8b533e390c999cda7470fcc157c Mon Sep 17 00:00:00 2001
From: Ebag333 <ebagola@gmail.com>
Date: Wed, 14 Dec 2016 13:06:13 -0800
Subject: [PATCH] Fixing some issues due to import cleanup

---
 eos/effectHandlerHelpers.py |  7 +++++++
 eos/saveddata/module.py     |  7 -------
 gui/mainFrame.py            |  3 +--
 service/market.py           | 18 ++++++++----------
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/eos/effectHandlerHelpers.py b/eos/effectHandlerHelpers.py
index 09ac4500b..c231f1519 100644
--- a/eos/effectHandlerHelpers.py
+++ b/eos/effectHandlerHelpers.py
@@ -159,6 +159,13 @@ class HandledModuleList(HandledList):
         for i in xrange(oldPos, len(self)):
             self[i].position -= 1
 
+    def toDummy(self, index):
+        mod = self[index]
+        if not mod.isEmpty:
+            dummy = eos.types.Module.buildEmpty(mod.slot)
+            dummy.position = index
+            self[index] = dummy
+
     def toModule(self, index, mod):
         mod.position = index
         self[index] = mod
diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py
index 6f6af24f9..d20efad5f 100644
--- a/eos/saveddata/module.py
+++ b/eos/saveddata/module.py
@@ -132,13 +132,6 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, l
             self.__chargeModifiedAttributes.original = self.__charge.attributes
             self.__chargeModifiedAttributes.overrides = self.__charge.overrides
 
-    def toDummy(self, index):
-        mod = self[index]
-        if not mod.isEmpty:
-            dummy = Module.buildEmpty(mod.slot)
-            dummy.position = index
-            self[index] = dummy
-
     @classmethod
     def buildEmpty(cls, slot):
         empty = Module(None)
diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index 4c7062f5a..25487a27d 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -50,9 +50,8 @@ from gui.preferenceDialog import PreferenceDialog
 from gui.graphFrame import GraphFrame
 from gui.copySelectDialog import CopySelectDialog
 from gui.utils.clipboard import toClipboard, fromClipboard
-from gui.fleetBrowser import FleetBrowser # Noqa - TODO: unsure if this is needed here
 from gui.updateDialog import UpdateDialog
-from gui.builtinViews import * # Noqa - TODO: unsure if this is needed here
+from gui.builtinViews import * # TODO: unsure if this is needed here
 from gui import graphFrame
 
 from service.settings import SettingsProvider
diff --git a/service/market.py b/service/market.py
index 8bd49e9cd..d9b132377 100644
--- a/service/market.py
+++ b/service/market.py
@@ -28,7 +28,7 @@ from sqlalchemy.sql import or_
 import config
 import eos.db
 # TODO: Find out what this is.  There is no conversions
-# from service import conversions
+from service import conversions
 from service.settings import SettingsProvider
 from service.price import Price
 
@@ -410,15 +410,13 @@ class Market():
                 item = identity
             elif isinstance(identity, int):
                 item = eos.db.getItem(identity, *args, **kwargs)
-                # TODO: Find out what this is.  There is no conversions
-                """
-                # Unindent 1 tab
-                elif isinstance(identity, basestring):
-                    # We normally lookup with string when we are using import/export
-                    # features. Check against overrides
-                    identity = conversions.all.get(identity, identity)
-                    item = eos.db.getItem(identity, *args, **kwargs)
-                """
+            # TODO: Find out what this is.  There is no conversions
+            elif isinstance(identity, basestring):
+                # We normally lookup with string when we are using import/export
+                # features. Check against overrides
+                identity = conversions.all.get(identity, identity)
+                item = eos.db.getItem(identity, *args, **kwargs)
+
             elif isinstance(identity, float):
                 id = int(identity)
                 item = eos.db.getItem(id, *args, **kwargs)