← Back to branch summary

~zulcss/nova/house-cleaning

« back to all changes in this revision

Viewing changes to debian/patches/remove-deprecated-sqlalchemy-option.patch

  • Committer: Chuck Short
  • Date: 2013-07-30 14:29:02 UTC
  • Revision ID: zulcss@ubuntu.com-20130730142902-slhz5fokgjsak57k
* New usptream release. 
* debian/patches/avoid_requirements_cheetah.patch: Dropped
* debian/patches/fix-sqlalchemy-0.7.9-usage.patch: Dropped
* debian/patches/fix-requirements.patch: Refreshed.
* debian/patches/remove-deprecated-sqlalchemy-option.patch: Remove
  deprecated option with sqlalchemy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/remove-deprecated-sqlalchemy-option.patch
 
1
Description: Remove deprecated sqlalchemy assert_unicode.
 
2
Author: Chuck Short <zulcss@ubuntu.com>
 
3
Forwarded: Yes
 
4
diff -Naurp nova-2013.2.a2367.gb404bfd.orig/nova/db/sqlalchemy/migrate_repo/versions/203_make_user_quotas_key_and_value.py nova-2013.2.a2367.gb404bfd/nova/db/sqlalchemy/migrate_repo/versions/203_make_user_quotas_key_and_value.py
 
5
--- nova-2013.2.a2367.gb404bfd.orig/nova/db/sqlalchemy/migrate_repo/versions/203_make_user_quotas_key_and_value.py      2013-07-30 13:01:25.000000000 +0000
 
6
+++ nova-2013.2.a2367.gb404bfd/nova/db/sqlalchemy/migrate_repo/versions/203_make_user_quotas_key_and_value.py   2013-07-30 13:44:02.410948311 +0000
 
7
@@ -35,7 +35,7 @@ def upgrade(migrate_engine):
 
8
     quota_usages = utils.get_table(migrate_engine, 'quota_usages')
 
9
     user_id = Column('user_id',
 
10
                      String(length=255, convert_unicode=False,
 
11
-                            assert_unicode=None, unicode_error=None,
 
12
+                            unicode_error=None,
 
13
                             _warn_on_bytestring=False))
 
14
     quota_usages.create_column(user_id)
 
15
 
 
16
@@ -43,7 +43,7 @@ def upgrade(migrate_engine):
 
17
                                 db._SHADOW_TABLE_PREFIX + 'quota_usages')
 
18
     user_id = Column('user_id',
 
19
                      String(length=255, convert_unicode=False,
 
20
-                            assert_unicode=None, unicode_error=None,
 
21
+                            unicode_error=None,
 
22
                             _warn_on_bytestring=False))
 
23
     shadow_quota_usages.create_column(user_id)
 
24
 
 
25
@@ -51,7 +51,7 @@ def upgrade(migrate_engine):
 
26
     reservations = utils.get_table(migrate_engine, 'reservations')
 
27
     user_id = Column('user_id',
 
28
                      String(length=255, convert_unicode=False,
 
29
-                            assert_unicode=None, unicode_error=None,
 
30
+                            unicode_error=None,
 
31
                             _warn_on_bytestring=False))
 
32
     reservations.create_column(user_id)
 
33
 
 
34
@@ -59,7 +59,7 @@ def upgrade(migrate_engine):
 
35
                                 db._SHADOW_TABLE_PREFIX + 'reservations')
 
36
     user_id = Column('user_id',
 
37
                      String(length=255, convert_unicode=False,
 
38
-                            assert_unicode=None, unicode_error=None,
 
39
+                            unicode_error=None,
 
40
                             _warn_on_bytestring=False))
 
41
     shadow_reservations.create_column(user_id)
 
42
 
 
43
@@ -83,17 +83,17 @@ def upgrade(migrate_engine):
 
44
                         Column('deleted', Integer),
 
45
                         Column('user_id',
 
46
                                String(length=255, convert_unicode=False,
 
47
-                                      assert_unicode=None, unicode_error=None,
 
48
+                                      unicode_error=None,
 
49
                                       _warn_on_bytestring=False),
 
50
                                nullable=False),
 
51
                         Column('project_id',
 
52
                                String(length=255, convert_unicode=False,
 
53
-                                      assert_unicode=None, unicode_error=None,
 
54
+                                      unicode_error=None,
 
55
                                       _warn_on_bytestring=False),
 
56
                                nullable=False),
 
57
                         Column('resource',
 
58
                                String(length=255, convert_unicode=False,
 
59
-                                      assert_unicode=None, unicode_error=None,
 
60
+                                      unicode_error=None,
 
61
                                       _warn_on_bytestring=False),
 
62
                                nullable=False),
 
63
                         Column('hard_limit', Integer, nullable=True),