Roll up #967 and #974

Takes the import fixes and cleanup out of those and rolls it into this
one

gui/propertyEditor.py

@@ -11,7 +11,7 @@ except:
     else:
         raise
 
-import eos.db
+from eos.db.gamedata.queries import getItem, getAttributeInfo
 from service.market import Market
 import gui.display as d
 import gui.globalEvents as GE
@@ -104,8 +104,8 @@ class AttributeEditor(wx.Frame):
                 spamreader = csv.reader(csvfile)
                 for row in spamreader:
                     itemID, attrID, value = row
-                    item = eos.db.getItem(int(itemID))
-                    attr = eos.db.getAttributeInfo(int(attrID))
+                    item = getItem(int(itemID))
+                    attr = getAttributeInfo(int(attrID))
                     item.setOverride(attr, float(value))
             self.itemView.updateItems(True)