some more PEP8 love all over the files

migrate/versioning/api.py

@@ -14,9 +14,11 @@
 
 import sys
 import inspect
+
 from sqlalchemy import create_engine
-from migrate.versioning import exceptions, repository, schema, version
-import script as script_ #command name conflict
+
+from migrate.versioning import (exceptions, repository, schema, version,
+    script as script_) # command name conflict
 
 __all__ = [
 'help',

migrate/versioning/cfgparse.py

@@ -2,9 +2,10 @@
    Configuration parser module.
 """
 
+from ConfigParser import ConfigParser
+
 from migrate.versioning.base import *
 from migrate.versioning import pathed
-from ConfigParser import ConfigParser
 
 
 class Parser(ConfigParser):

migrate/versioning/exceptions.py

@@ -56,11 +56,12 @@ class LogSqlError(Error):
         self.entry = entry
 
     def __str__(self):
-        ret = "SQL error in statement: \n%s\n"%(str(self.entry))
-        ret += "Traceback from change script:\n"
-        ret += ''.join(traceback.format_list(self.entry.traceback))
-        ret += str(self.sqlerror)
-        return ret
+        """SQL error in statement:
+        %s
+        Traceback from change script:
+        %s%s""" % (self.entry,
+            ''.join(traceback.format_list(self.entry.traceback)),
+            self.sqlerror)
 
 
 class PathError(Error):

migrate/versioning/genmodel.py

@@ -7,6 +7,7 @@
 """
 
 import sys
+
 import migrate
 import sqlalchemy
 

migrate/versioning/migrate_repository.py

@@ -5,7 +5,6 @@
 """
 
 import os
-import os.path
 import sys
 
 

migrate/versioning/pathed.py

@@ -2,11 +2,12 @@
    A path/directory class.
 """
 
+import os
+import shutil
+
 from migrate.versioning.base import *
 from migrate.versioning.util import KeyedInstance
 from migrate.versioning import exceptions
-import os
-import shutil
 
 
 class Pathed(KeyedInstance):

migrate/versioning/repository.py

@@ -1,13 +1,14 @@
 """
    SQLAlchemy migrate repository management.
 """
-from pkg_resources import resource_string, resource_filename
 import os
 import shutil
 import string
-from migrate.versioning.base import *
-from migrate.versioning.template import template
+from pkg_resources import resource_string, resource_filename
+
 from migrate.versioning import exceptions, script, version, pathed, cfgparse
+from migrate.versioning.template import template
+from migrate.versioning.base import *
 
 
 class Changeset(dict):

migrate/versioning/schema.py

@@ -1,21 +1,22 @@
 """
    Database schema version management.
 """
-from sqlalchemy import Table, Column, MetaData, String, Text, Integer, \
-    create_engine
+from sqlalchemy import (Table, Column, MetaData, String, Text, Integer,
+    create_engine)
 from sqlalchemy.sql import and_
 from sqlalchemy import exceptions as sa_exceptions
+
+from migrate.versioning import exceptions, genmodel, schemadiff
 from migrate.versioning.repository import Repository
 from migrate.versioning.util import loadModel
 from migrate.versioning.version import VerNum
-from migrate.versioning import exceptions, genmodel, schemadiff
 
 
 class ControlledSchema(object):
     """A database under version control"""
 
     def __init__(self, engine, repository):
-        if type(repository) is str:
+        if isinstance(repository, str):
             repository=Repository(repository)
         self.engine = engine
         self.repository = repository

migrate/versioning/shell.py

@@ -14,6 +14,7 @@ alias = dict(
     dbv=api.db_version,
     v=api.version,
 )
+
 def alias_setup():
     global alias
     for key,val in alias.iteritems():
@@ -25,6 +26,7 @@ class PassiveOptionParser(OptionParser):
 
     def _process_args(self, largs, rargs, values):
         """little hack to support all --some_option=value parameters"""
+
         while rargs:
             arg = rargs[0]
             if arg == "--":
@@ -50,6 +52,7 @@ class PassiveOptionParser(OptionParser):
 
 def main(argv=None, **kwargs):
     """kwargs are default options that can be overriden with passing --some_option to cmdline"""
+
     argv = argv or list(sys.argv[1:])
     commands = list(api.__all__)
     commands.sort()