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/preferenceView.py
+++ b/gui/preferenceView.py
@@ -37,4 +37,5 @@ class PreferenceView(object):
        return wx.NullBitmap


-from gui.builtinPreferenceViews import *  # noqa
+from gui.builtinPreferenceViews import pyfaCrestPreferences, pyfaGeneralPreferences, \
+    pyfaHTMLExportPreferences, pyfaNetworkPreferences, pyfaUpdatePreferences