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/viewColumn.py
+++ b/gui/viewColumn.py
@@ -65,4 +65,5 @@ class ViewColumn(object):
        raise NotImplementedError()


-from gui.builtinViewColumns import *  # noqa
+from gui.builtinViewColumns import abilities, ammo, ammoIcon, attributeDisplay, baseIcon, baseName, capacitorUse, maxRange, \
+    misc, price, propertyDisplay, state