From 33edbd16781b97e1c57e3b539835ad74f89df591 Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Thu, 8 Aug 2013 08:41:58 -0400 Subject: [PATCH] db: Remove deprecated assert_unicode attribute Remove deprecated assert_unicode sqlalchemy attribute, removed in sqlalchemy 0.8.0. The deprecation is described at: http://docs.sqlalchemy.org/en/latest/changelog/changelog_08.html#change-ad44af79c886d1bb283042deb64f9cbe Change-Id: I874be66948fc296bc6afe7f731dc4731645f0fbe Signed-off-by: Chuck Short --- .../migrate_repo/versions/019_resource_action_status.py | 6 +----- .../db/sqlalchemy/migrate_repo/versions/020_stack_action.py | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py b/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py index 5684c845..a9a8f415 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/019_resource_action_status.py @@ -22,11 +22,7 @@ def upgrade(migrate_engine): # Align the current state/state_description with the # action/status now used in the event table action = sqlalchemy.Column('action', - sqlalchemy.String(length=255, - convert_unicode=False, - assert_unicode=None, - unicode_error=None, - _warn_on_bytestring=False)) + sqlalchemy.String(length=255)) action.create(resource) resource.c.state.alter(name='status') resource.c.state_description.alter(name='status_reason') diff --git a/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py b/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py index e6130edf..4d635650 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/020_stack_action.py @@ -21,11 +21,7 @@ def upgrade(migrate_engine): stack = sqlalchemy.Table('stack', meta, autoload=True) # Align with action/status now used in the event/resource tables action = sqlalchemy.Column('action', - sqlalchemy.String(length=255, - convert_unicode=False, - assert_unicode=None, - unicode_error=None, - _warn_on_bytestring=False)) + sqlalchemy.String(length=255)) action.create(stack) -- 2.45.2