openstack/cinder
Code Issues Proposed changes

remove deprecated assert_unicode sqlalchemy attribute

Browse Source 
Removing this enables use with sqlalchemy 0.8.0
The deprecation is described upstream at:
http://docs.sqlalchemy.org/en/latest/changelog/changelog_08.html#change-ad44af79c886d1bb283042deb64f9cbe

Change-Id: I305bfdbcd3c3669c41318ea34115624f729b3909
This commit is contained in:
Pádraig Brady 2013-04-02 14:44:51 +01:00
parent 3aa947d763
commit 105cae43c7
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
View File

@ -37,14 +37,12 @@ def upgrade(migrate_engine):
Column('class_name',
String(length=255,
convert_unicode=True,
assert_unicode=None,
unicode_error=None,
_warn_on_bytestring=False),
index=True),
Column('resource',
String(length=255,
convert_unicode=True,
assert_unicode=None,
unicode_error=None,
_warn_on_bytestring=False)),
Column('hard_limit', Integer(), nullable=True),
@ -67,12 +65,12 @@ def upgrade(migrate_engine):
Column('id', Integer(), primary_key=True),
Column('project_id',
String(length=255, convert_unicode=True,
assert_unicode=None, unicode_error=None,
unicode_error=None,
_warn_on_bytestring=False),
index=True),
Column('resource',
String(length=255, convert_unicode=True,
assert_unicode=None, unicode_error=None,
unicode_error=None,
_warn_on_bytestring=False)),
Column('in_use', Integer(), nullable=False),
Column('reserved', Integer(), nullable=False),
@ -97,7 +95,6 @@ def upgrade(migrate_engine):
Column('uuid',
String(length=36,
convert_unicode=True,
assert_unicode=None,
unicode_error=None,
_warn_on_bytestring=False),
nullable=False),
@ -107,12 +104,12 @@ def upgrade(migrate_engine):
nullable=False),
Column('project_id',
String(length=255, convert_unicode=True,
assert_unicode=None, unicode_error=None,
unicode_error=None,
_warn_on_bytestring=False),
index=True),
Column('resource',
String(length=255, convert_unicode=True,
assert_unicode=None, unicode_error=None,
unicode_error=None,
_warn_on_bytestring=False)),
Column('delta', Integer(), nullable=False),
Column('expire', DateTime(timezone=False)),

11
cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py
View File

@ -37,49 +37,38 @@ def upgrade(migrate_engine):
Column('id', String(36), primary_key=True, nullable=False),
Column('volume_id', String(36), nullable=False),
Column('user_id', String(length=255, convert_unicode=False,
assert_unicode=None,
unicode_error=None,
_warn_on_bytestring=False)),
Column('project_id', String(length=255, convert_unicode=False,
assert_unicode=None,
unicode_error=None,
_warn_on_bytestring=False)),
Column('host', String(length=255, convert_unicode=False,
assert_unicode=None,
unicode_error=None,
_warn_on_bytestring=False)),
Column('availability_zone', String(length=255,
convert_unicode=False,
assert_unicode=None,
unicode_error=None,
_warn_on_bytestring=False)),
Column('display_name', String(length=255, convert_unicode=False,
assert_unicode=None,
unicode_error=None,
_warn_on_bytestring=False)),
Column('display_description', String(length=255,
convert_unicode=False,
assert_unicode=None,
unicode_error=None,
_warn_on_bytestring=False)),
Column('container', String(length=255, convert_unicode=False,
assert_unicode=None,
unicode_error=None,
_warn_on_bytestring=False)),
Column('status', String(length=255, convert_unicode=False,
assert_unicode=None,
unicode_error=None,
_warn_on_bytestring=False)),
Column('fail_reason', String(length=255, convert_unicode=False,
assert_unicode=None,
unicode_error=None,
_warn_on_bytestring=False)),
Column('service_metadata', String(length=255, convert_unicode=False,
assert_unicode=None,
unicode_error=None,
_warn_on_bytestring=False)),
Column('service', String(length=255, convert_unicode=False,
assert_unicode=None,
unicode_error=None,
_warn_on_bytestring=False)),
Column('size', Integer()),