# HG changeset patch # User Marcin Kuzminski # Date 1301998992 -7200 # Node ID 3bd2e94cbfc83b5e7a428c4dabd3ddd7de071183 # Parent efee58510c1aae5f98d794961e2f99911e4f6e8e pep8ify diff -r efee58510c1a -r 3bd2e94cbfc8 rhodecode/lib/dbmigrate/__init__.py --- a/rhodecode/lib/dbmigrate/__init__.py Tue Apr 05 02:16:07 2011 +0200 +++ b/rhodecode/lib/dbmigrate/__init__.py Tue Apr 05 12:23:12 2011 +0200 @@ -32,6 +32,7 @@ log = logging.getLogger(__name__) + class UpgradeDb(BasePasterCommand): """Command used for paster to upgrade our database to newer version """ @@ -57,8 +58,6 @@ dbmanage.upgrade() - - def update_parser(self): self.parser.add_option('--sql', action='store_true', diff -r efee58510c1a -r 3bd2e94cbfc8 rhodecode/lib/dbmigrate/migrate/changeset/__init__.py --- a/rhodecode/lib/dbmigrate/migrate/changeset/__init__.py Tue Apr 05 02:16:07 2011 +0200 +++ b/rhodecode/lib/dbmigrate/migrate/changeset/__init__.py Tue Apr 05 12:23:12 2011 +0200 @@ -12,7 +12,8 @@ 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 @@ -21,8 +22,8 @@ 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,) diff -r efee58510c1a -r 3bd2e94cbfc8 rhodecode/lib/dbmigrate/migrate/exceptions.py --- a/rhodecode/lib/dbmigrate/migrate/exceptions.py Tue Apr 05 02:16:07 2011 +0200 +++ b/rhodecode/lib/dbmigrate/migrate/exceptions.py Tue Apr 05 12:23:12 2011 +0200 @@ -71,11 +71,6 @@ """Invalid script error.""" -class InvalidVersionError(Error): - """Invalid version error.""" - -# migrate.changeset - class NotSupportedError(Error): """Not supported error""" @@ -83,5 +78,6 @@ class InvalidConstraintError(Error): """Invalid constraint error""" + class MigrateDeprecationWarning(DeprecationWarning): """Warning for deprecated features in Migrate"""