Reformatting eos.db

eos/db/__init__.py

@@ -20,12 +20,10 @@
 import threading
 
 from sqlalchemy import MetaData, create_engine
-from sqlalchemy.orm import sessionmaker, scoped_session
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy import pool
+from sqlalchemy.orm import sessionmaker
 
-from eos import config
 import migration
+from eos import config
 
 
 class ReadOnlyException(Exception):

eos/db/migration.py

@@ -1,20 +1,22 @@
-import config
+import logging
 import shutil
 import time
-import re
-import os
+
+import config
 import migrations
-import logging
 
 logger = logging.getLogger(__name__)
 
+
 def getVersion(db):
     cursor = db.execute('PRAGMA user_version')
     return cursor.fetchone()[0]
 
+
 def getAppVersion():
     return migrations.appVersion
 
+
 def update(saveddata_engine):
     dbVersion = getVersion(saveddata_engine)
     appVersion = getAppVersion()
@@ -24,7 +26,7 @@ def update(saveddata_engine):
 
     if dbVersion < appVersion:
         # Automatically backup database
-        toFile = "%s/saveddata_migration_%d-%d_%s.db"%(
+        toFile = "%s/saveddata_migration_%d-%d_%s.db" % (
             config.savePath,
             dbVersion,
             appVersion,
@@ -33,9 +35,9 @@ def update(saveddata_engine):
         shutil.copyfile(config.saveDB, toFile)
 
         for version in xrange(dbVersion, appVersion):
-            func = migrations.updates[version+1]
+            func = migrations.updates[version + 1]
             if func:
-                logger.info("Applying database update: %d", version+1)
+                logger.info("Applying database update: %d", version + 1)
                 func(saveddata_engine)
 
         # when all is said and done, set version to current

eos/db/migrations/__init__.py

@@ -11,7 +11,6 @@ upgrade files 1-5)
 import pkgutil
 import re
 
-
 updates = {}
 appVersion = 0
 

eos/db/saveddata/queries.py

@@ -19,7 +19,6 @@
 
 from sqlalchemy.sql import and_
 
-import eos.config
 from eos.db import saveddata_session, sd_lock
 from eos.db.saveddata.fit import projectedFits_table
 from eos.db.saveddata.fleet import squadmembers_table

eos/db/util.py

@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,10 +15,10 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy.orm import eagerload
-from sqlalchemy.sql import and_, or_
+from sqlalchemy.sql import and_
 
 replace = {"attributes": "_Item__attributes",
            "modules": "_Fit__modules",
@@ -31,6 +31,7 @@ replace = {"attributes": "_Item__attributes",
            "damagePattern": "_Fit__damagePattern",
            "projectedFits": "_Fit__projectedFits"}
 
+
 def processEager(eager):
     if eager is None:
         return tuple()
@@ -44,6 +45,7 @@ def processEager(eager):
 
         return l
 
+
 def _replacements(eagerString):
     splitEager = eagerString.split(".")
     for i in xrange(len(splitEager)):
@@ -54,6 +56,7 @@ def _replacements(eagerString):
 
     return ".".join(splitEager)
 
+
 def processWhere(clause, where):
     if where is not None:
         if not hasattr(where, "__iter__"):