rpm/SOURCES/0003-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch

   1 From 2e3d9b429a79a9e6f39eba7907386bf30cb777d6 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady@redhat.com>
   3 Date: Tue, 2 Apr 2013 14:44:51 +0100
   4 Subject: [PATCH] remove deprecated assert_unicode sqlalchemy attribute
   5
   6 Removing this enables use with sqlalchemy 0.8.0
   7 The deprecation is described upstream at:
   8 http://docs.sqlalchemy.org/en/latest/changelog/changelog_08.html#change-ad44af79c886d1bb283042deb64f9cbe
   9
  10 Change-Id: I305bfdbcd3c3669c41318ea34115624f729b3909
  11 ---
  12  cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py | 11 ++++-------
  13  cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py  | 11 -----------
  14  2 files changed, 4 insertions(+), 18 deletions(-)
  15
  16 diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py b/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
  17 index 9f5b643..fe911c0 100644
  18 --- a/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
  19 +++ b/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
  20 @@ -37,14 +37,12 @@ def upgrade(migrate_engine):
  21                            Column('class_name',
  22                                   String(length=255,
  23                                          convert_unicode=True,
  24 -                                        assert_unicode=None,
  25                                          unicode_error=None,
  26                                          _warn_on_bytestring=False),
  27                                   index=True),
  28                            Column('resource',
  29                                   String(length=255,
  30                                          convert_unicode=True,
  31 -                                        assert_unicode=None,
  32                                          unicode_error=None,
  33                                          _warn_on_bytestring=False)),
  34                            Column('hard_limit', Integer(), nullable=True),
  35 @@ -67,12 +65,12 @@ def upgrade(migrate_engine):
  36                           Column('id', Integer(), primary_key=True),
  37                           Column('project_id',
  38                                  String(length=255, convert_unicode=True,
  39 -                                       assert_unicode=None, unicode_error=None,
  40 +                                       unicode_error=None,
  41                                         _warn_on_bytestring=False),
  42                                  index=True),
  43                           Column('resource',
  44                                  String(length=255, convert_unicode=True,
  45 -                                       assert_unicode=None, unicode_error=None,
  46 +                                       unicode_error=None,
  47                                         _warn_on_bytestring=False)),
  48                           Column('in_use', Integer(), nullable=False),
  49                           Column('reserved', Integer(), nullable=False),
  50 @@ -97,7 +95,6 @@ def upgrade(migrate_engine):
  51                           Column('uuid',
  52                                  String(length=36,
  53                                         convert_unicode=True,
  54 -                                       assert_unicode=None,
  55                                         unicode_error=None,
  56                                         _warn_on_bytestring=False),
  57                                  nullable=False),
  58 @@ -107,12 +104,12 @@ def upgrade(migrate_engine):
  59                                  nullable=False),
  60                           Column('project_id',
  61                                  String(length=255, convert_unicode=True,
  62 -                                       assert_unicode=None, unicode_error=None,
  63 +                                       unicode_error=None,
  64                                         _warn_on_bytestring=False),
  65                                  index=True),
  66                           Column('resource',
  67                                  String(length=255, convert_unicode=True,
  68 -                                       assert_unicode=None, unicode_error=None,
  69 +                                       unicode_error=None,
  70                                         _warn_on_bytestring=False)),
  71                           Column('delta', Integer(), nullable=False),
  72                           Column('expire', DateTime(timezone=False)),
  73 diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py b/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py
  74 index 4cc1689..5dfbed0 100644
  75 --- a/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py
  76 +++ b/cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py
  77 @@ -37,49 +37,38 @@ def upgrade(migrate_engine):
  78          Column('id', String(36), primary_key=True, nullable=False),
  79          Column('volume_id', String(36), nullable=False),
  80          Column('user_id', String(length=255, convert_unicode=False,
  81 -                                 assert_unicode=None,
  82                                   unicode_error=None,
  83                                   _warn_on_bytestring=False)),
  84          Column('project_id', String(length=255, convert_unicode=False,
  85 -                                    assert_unicode=None,
  86                                      unicode_error=None,
  87                                      _warn_on_bytestring=False)),
  88          Column('host', String(length=255, convert_unicode=False,
  89 -                              assert_unicode=None,
  90                                unicode_error=None,
  91                                _warn_on_bytestring=False)),
  92          Column('availability_zone', String(length=255,
  93                                             convert_unicode=False,
  94 -                                           assert_unicode=None,
  95                                             unicode_error=None,
  96                                             _warn_on_bytestring=False)),
  97          Column('display_name', String(length=255, convert_unicode=False,
  98 -                                      assert_unicode=None,
  99                                        unicode_error=None,
 100                                        _warn_on_bytestring=False)),
 101          Column('display_description', String(length=255,
 102                                               convert_unicode=False,
 103 -                                             assert_unicode=None,
 104                                               unicode_error=None,
 105                                               _warn_on_bytestring=False)),
 106          Column('container', String(length=255, convert_unicode=False,
 107 -                                   assert_unicode=None,
 108                                     unicode_error=None,
 109                                     _warn_on_bytestring=False)),
 110          Column('status', String(length=255, convert_unicode=False,
 111 -                                assert_unicode=None,
 112                                  unicode_error=None,
 113                                  _warn_on_bytestring=False)),
 114          Column('fail_reason', String(length=255, convert_unicode=False,
 115 -                                     assert_unicode=None,
 116                                       unicode_error=None,
 117                                       _warn_on_bytestring=False)),
 118          Column('service_metadata', String(length=255, convert_unicode=False,
 119 -                                          assert_unicode=None,
 120                                            unicode_error=None,
 121                                            _warn_on_bytestring=False)),
 122          Column('service', String(length=255, convert_unicode=False,
 123 -                                 assert_unicode=None,
 124                                   unicode_error=None,
 125                                   _warn_on_bytestring=False)),
 126          Column('size', Integer()),