Updated po-ta-toe to po-tah-toh

thommey · Jun 16, 2016 · b790095 · b790095
1 parent 12ccc96
commit b790095
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/eos/db/saveddata/loadDefaultDatabaseValues.py b/eos/db/saveddata/loadDefaultDatabaseValues.py
@@ -23,7 +23,7 @@
 class ImportError(Exception):
     pass
 
-class defaultDatabaseValues():
+class DefaultDatabaseValues():
     instance = None
 
     @classmethod

diff --git a/gui/mainFrame.py b/gui/mainFrame.py
@@ -38,7 +38,6 @@
 import gui.chromeTabs
 import gui.utils.animUtils as animUtils
 import gui.globalEvents as GE
-import eos.db.saveddata.loadDefaultDatabaseValues as loadDefaultDatabaseValues
 
 from gui.bitmapLoader import BitmapLoader
 from gui.mainMenuBar import MainMenuBar
@@ -62,6 +61,7 @@
 
 # import this to access override setting
 from eos.modifiedAttributeDict import ModifiedAttributeDict
+from eos.db.saveddata.loadDefaultDatabaseValues import DefaultDatabaseValues
 
 from time import gmtime, strftime
 
@@ -407,14 +407,12 @@ def goForums(self, event):
         webbrowser.open('https://forums.eveonline.com/default.aspx?g=posts&t=466425')
 
     def loadDatabaseDefaults(self, event):
-        # Import default database values
-        importDBDefaults = loadDefaultDatabaseValues.defaultDatabaseValues()
         # Import values that must exist otherwise Pyfa breaks
-        importDBDefaults.importRequiredDefaults()
+        DefaultDatabaseValues.importRequiredDefaults()
         # Import default values for damage profiles
-        importDBDefaults.importDamageProfileDefaults()
+        DefaultDatabaseValues.importDamageProfileDefaults()
         # Import default values for target resist profiles
-        importDBDefaults.importResistProfileDefaults()
+        DefaultDatabaseValues.importResistProfileDefaults()
 
     def registerMenu(self):
         menuBar = self.GetMenuBar()

diff --git a/service/damagePattern.py b/service/damagePattern.py
@@ -19,9 +19,10 @@
 
 import eos.db
 import eos.types
-import eos.db.saveddata.loadDefaultDatabaseValues as loadDefaultDatabaseValues
 import copy
 
+from eos.db.saveddata.loadDefaultDatabaseValues import DefaultDatabaseValues
+
 class ImportError(Exception):
     pass
 
@@ -37,7 +38,9 @@ def getInstance(cls):
     def __init__(self):
         uniform = eos.db.getDamagePattern("Uniform")
         if uniform is None:
-            loadDefaultDatabaseValues.defaultDatabaseValues.importRequiredDefaults()
+            # Import default database values
+            # Import values that must exist otherwise Pyfa breaks
+            DefaultDatabaseValues.importRequiredDefaults()
 
     def getDamagePatternList(self):
         return eos.db.getDamagePatternList()

diff --git a/service/prefetch.py b/service/prefetch.py
@@ -22,7 +22,7 @@
 import os
 import eos.types
 import eos.db.migration as migration
-import eos.db.saveddata.loadDefaultDatabaseValues as loadDefaultDatabaseValues
+from eos.db.saveddata.loadDefaultDatabaseValues import DefaultDatabaseValues
 
 class PrefetchThread(threading.Thread):
     def run(self):
@@ -54,17 +54,17 @@ def run(self):
     migration.update(eos.db.saveddata_engine)
     # Import default database values
     # Import values that must exist otherwise Pyfa breaks
-    loadDefaultDatabaseValues.defaultDatabaseValues.importRequiredDefaults()
+    DefaultDatabaseValues.importRequiredDefaults()
 else:
     # If database does not exist, do not worry about migration. Simply
     # create and set version
     eos.db.saveddata_meta.create_all()
     eos.db.saveddata_engine.execute('PRAGMA user_version = {}'.format(migration.getAppVersion()))
     #Import default database values
-    #Import values that must exist otherwise Pyfa breaks
-    loadDefaultDatabaseValues.defaultDatabaseValues.importRequiredDefaults()
-    #Import default values for damage profiles
-    loadDefaultDatabaseValues.defaultDatabaseValues.importDamageProfileDefaults()
-    #Import default values for target resist profiles
-    loadDefaultDatabaseValues.defaultDatabaseValues.importResistProfileDefaults()
+    # Import values that must exist otherwise Pyfa breaks
+    DefaultDatabaseValues.importRequiredDefaults()
+    # Import default values for damage profiles
+    DefaultDatabaseValues.importDamageProfileDefaults()
+    # Import default values for target resist profiles
+    DefaultDatabaseValues.importResistProfileDefaults()