pep8ify

rhodecode/lib/dbmigrate/__init__.py

@@ -1,67 +1,66 b''
 # -*- coding: utf-8 -*-
 """
     rhodecode.lib.dbmigrate.__init__
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Database migration modules
 
     :created_on: Dec 11, 2010
     :author: marcink
     :copyright: (C) 2009-2011 Marcin Kuzminski <[e-mail]>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
 from sqlalchemy import engine_from_config
 
 
 from rhodecode.lib.utils import BasePasterCommand, Command, add_cache
 from rhodecode.lib.db_manage import DbManage
 
 log = logging.getLogger(__name__)
 
+
 class UpgradeDb(BasePasterCommand):
     """Command used for paster to upgrade our database to newer version
     """
 
     max_args = 1
     min_args = 1
 
     usage = "CONFIG_FILE"
     summary = "Upgrades current db to newer version given configuration file"
     group_name = "RhodeCode"
 
     parser = Command.standard_parser(verbose=True)
 
     def command(self):
         from pylons import config
 
         add_cache(config)
 
         db_uri = config['sqlalchemy.db1.url']
 
         dbmanage = DbManage(log_sql=True, dbconf=db_uri,
                             root=config['here'], tests=False)
 
         dbmanage.upgrade()
 
-
-
     def update_parser(self):
         self.parser.add_option('--sql',
                       action='store_true',
                       dest='just_sql',
                       help="Prints upgrade sql for further investigation",
                       default=False)

rhodecode/lib/dbmigrate/migrate/changeset/__init__.py

@@ -1,28 +1,29 b''
 """
    This module extends SQLAlchemy and provides additional DDL [#]_
    support.
 
    .. [#] SQL Data Definition Language
 """
 import re
 import warnings
 
 import sqlalchemy
 from sqlalchemy import __version__ as _sa_version
 
 warnings.simplefilter('always', DeprecationWarning)
 
-_sa_version = tuple(int(re.match("\d+", x).group(0)) for x in _sa_version.split("."))
+_sa_version = tuple(int(re.match("\d+", x).group(0))
+                    for x in _sa_version.split("."))
 SQLA_06 = _sa_version >= (0, 6)
 
 del re
 del _sa_version
 
 from rhodecode.lib.dbmigrate.migrate.changeset.schema import *
 from rhodecode.lib.dbmigrate.migrate.changeset.constraint import *
 
-sqlalchemy.schema.Table.__bases__ += (ChangesetTable, )
-sqlalchemy.schema.Column.__bases__ += (ChangesetColumn, )
-sqlalchemy.schema.Index.__bases__ += (ChangesetIndex, )
+sqlalchemy.schema.Table.__bases__ += (ChangesetTable,)
+sqlalchemy.schema.Column.__bases__ += (ChangesetColumn,)
+sqlalchemy.schema.Index.__bases__ += (ChangesetIndex,)
 
-sqlalchemy.schema.DefaultClause.__bases__ += (ChangesetDefaultClause, )
+sqlalchemy.schema.DefaultClause.__bases__ += (ChangesetDefaultClause,)

rhodecode/lib/dbmigrate/migrate/exceptions.py

@@ -1,87 +1,83 b''
 """
    Provide exception classes for :mod:`migrate`
 """
 
 
 class Error(Exception):
     """Error base class."""
 
 
 class ApiError(Error):
     """Base class for API errors."""
 
 
 class KnownError(ApiError):
     """A known error condition."""
 
 
 class UsageError(ApiError):
     """A known error condition where help should be displayed."""
 
 
 class ControlledSchemaError(Error):
     """Base class for controlled schema errors."""
 
 
 class InvalidVersionError(ControlledSchemaError):
     """Invalid version number."""
 
 
 class DatabaseNotControlledError(ControlledSchemaError):
     """Database should be under version control, but it's not."""
 
 
 class DatabaseAlreadyControlledError(ControlledSchemaError):
     """Database shouldn't be under version control, but it is"""
 
 
 class WrongRepositoryError(ControlledSchemaError):
     """This database is under version control by another repository."""
 
 
 class NoSuchTableError(ControlledSchemaError):
     """The table does not exist."""
 
 
 class PathError(Error):
     """Base class for path errors."""
 
 
 class PathNotFoundError(PathError):
     """A path with no file was required; found a file."""
 
 
 class PathFoundError(PathError):
     """A path with a file was required; found no file."""
 
 
 class RepositoryError(Error):
     """Base class for repository errors."""
 
 
 class InvalidRepositoryError(RepositoryError):
     """Invalid repository error."""
 
 
 class ScriptError(Error):
     """Base class for script errors."""
 
 
 class InvalidScriptError(ScriptError):
     """Invalid script error."""
 
 
-class InvalidVersionError(Error):
-    """Invalid version error."""
-
-# migrate.changeset
-
 class NotSupportedError(Error):
     """Not supported error"""
 
 
 class InvalidConstraintError(Error):
     """Invalid constraint error"""
 
+
 class MigrateDeprecationWarning(DeprecationWarning):
     """Warning for deprecated features in Migrate"""