# HG changeset patch # User RhodeCode Admin # Date 2023-08-29 08:09:10 # Node ID 86c1ad256ac15cd64ddff0dc813292b673df7a73 # Parent 0f0ff5393938f75ed877523c407df0c03c9d19a2 dbmigrate: python3 fixes diff --git a/rhodecode/lib/dbmigrate/migrate/versioning/cfgparse.py b/rhodecode/lib/dbmigrate/migrate/versioning/cfgparse.py --- a/rhodecode/lib/dbmigrate/migrate/versioning/cfgparse.py +++ b/rhodecode/lib/dbmigrate/migrate/versioning/cfgparse.py @@ -2,7 +2,7 @@ Configuration parser module. """ -import configparser +from configparser import ConfigParser from rhodecode.lib.dbmigrate.migrate.versioning.config import * from rhodecode.lib.dbmigrate.migrate.versioning import pathed diff --git a/rhodecode/lib/dbmigrate/migrate/versioning/schemadiff.py b/rhodecode/lib/dbmigrate/migrate/versioning/schemadiff.py --- a/rhodecode/lib/dbmigrate/migrate/versioning/schemadiff.py +++ b/rhodecode/lib/dbmigrate/migrate/versioning/schemadiff.py @@ -97,7 +97,7 @@ class ColDiff(object): self.diff=True return - def __bool__(self): + def __nonzero__(self): return self.diff __bool__ = __nonzero__ @@ -132,7 +132,7 @@ class TableDiff(object): 'columns_different', ) - def __bool__(self): + def __nonzero__(self): return bool( self.columns_missing_from_A or self.columns_missing_from_B or diff --git a/rhodecode/lib/dbmigrate/migrate/versioning/version.py b/rhodecode/lib/dbmigrate/migrate/versioning/version.py --- a/rhodecode/lib/dbmigrate/migrate/versioning/version.py +++ b/rhodecode/lib/dbmigrate/migrate/versioning/version.py @@ -64,6 +64,12 @@ class VerNum(object): def __int__(self): return int(self.value) + def __index__(self): + return int(self.value) + + def __hash__(self): + return hash(self.value) + class Collection(pathed.Pathed): """A collection of versioning scripts in a repository"""