diff options
| author | lora <lorochka85@gmail.com> | 2011-11-19 17:01:40 -0600 |
|---|---|---|
| committer | lora <lorochka85@gmail.com> | 2011-11-19 17:01:40 -0600 |
| commit | 707001950a42c7adfd6657f227a2c2dbbd09afce (patch) | |
| tree | 9a7215448098b8681b2b45fe636eb8af6c3ea8ba /mediagoblin/db/util.py | |
| parent | 2d62e9efd210becd30982e65e06a6ef97029b391 (diff) | |
| parent | aea6d577cbf4d937427dea173f74fb17ad45bd75 (diff) | |
| download | mediagoblin-707001950a42c7adfd6657f227a2c2dbbd09afce.tar.lz mediagoblin-707001950a42c7adfd6657f227a2c2dbbd09afce.tar.xz mediagoblin-707001950a42c7adfd6657f227a2c2dbbd09afce.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/db/util.py')
| -rw-r--r-- | mediagoblin/db/util.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py index 84a6cbce..52e97f6d 100644 --- a/mediagoblin/db/util.py +++ b/mediagoblin/db/util.py @@ -118,11 +118,12 @@ def remove_deprecated_indexes(database, deprecated_indexes=DEPRECATED_INDEXES): ################# # The default migration registry... -# +# # Don't set this yourself! RegisterMigration will automatically fill # this with stuff via decorating methods in migrations.py -class MissingCurrentMigration(Exception): pass +class MissingCurrentMigration(Exception): + pass MIGRATIONS = {} @@ -147,7 +148,7 @@ class RegisterMigration(object): """ def __init__(self, migration_number, migration_registry=MIGRATIONS): assert migration_number > 0, "Migration number must be > 0!" - assert not migration_registry.has_key(migration_number), \ + assert migration_number not in migration_registry, \ "Duplicate migration numbers detected! That's not allowed!" self.migration_number = migration_number |