Roll up #967 and #974

Takes the import fixes and cleanup out of those and rolls it into this one
2017-02-08 13:12:54 -08:00
parent 25182de365
commit e18deb5eeb
17 changed files with 53 additions and 60 deletions
--- a/gui/contextMenu.py
+++ b/gui/contextMenu.py
@@ -177,4 +177,6 @@ class ContextMenu(object):
        return None


-from gui.builtinContextMenus import *  # noqa
+from gui.builtinContextMenus import ammoPattern, amount, cargo, changeAffectingSkills, damagePattern, droneRemoveStack, \
+    droneSplit, factorReload, fighterAbilities, implantSets, itemRemove, itemStats, marketJump, metaSwap, moduleAmmoPicker, \
+    moduleGlobalAmmoPicker, openFit, priceClear, project, shipJump, tacticalMode, targetResists, whProjector