From ad6fc59ef46daf7f5416640f141831c8d39fe4f3 Mon Sep 17 00:00:00 2001 From: Olga Kopylova Date: Fri, 29 Nov 2013 12:37:18 +0200 Subject: [PATCH] db: make compatible with SQLAlchemy 0.8 Argument assert_unicode is deprecated in SQLAlchemy 0.7. Also it is removed from SQLAlchemy 0.8. Arguments convert_unicode, unicode_error, and _warn_on_bytestring seem to cause problems with SQLAlchemy 0.8. Closes-bug: 1235829 Change-Id: I713dd446756398805404400d05b1d0927601dd97 --- trove/db/sqlalchemy/migrate_repo/schema.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/trove/db/sqlalchemy/migrate_repo/schema.py b/trove/db/sqlalchemy/migrate_repo/schema.py index bdc7885913..578ea7effc 100644 --- a/trove/db/sqlalchemy/migrate_repo/schema.py +++ b/trove/db/sqlalchemy/migrate_repo/schema.py @@ -24,14 +24,10 @@ import sqlalchemy.types logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema') -String = lambda length: sqlalchemy.types.String( - length=length, convert_unicode=False, assert_unicode=None, - unicode_error=None, _warn_on_bytestring=False) +String = lambda length: sqlalchemy.types.String(length=length) -Text = lambda: sqlalchemy.types.Text( - length=None, convert_unicode=False, assert_unicode=None, - unicode_error=None, _warn_on_bytestring=False) +Text = lambda: sqlalchemy.types.Text(length=None) Boolean = lambda: sqlalchemy.types.Boolean(create_constraint=True, name=None)