summaryrefslogtreecommitdiff
path: root/oslo_db
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-04-16 12:15:34 +0000
committerGerrit Code Review <review@openstack.org>2021-04-16 12:15:34 +0000
commit77cc11a526c64b24dfc91ef023abed4009b734fe (patch)
treec02fb74187a7b5c70f1b5ae5765c7d38cbb360e1 /oslo_db
parentc4dbedfdc32ede1081fa45718cdc2bcb2b39594b (diff)
parent273009f63d1766f0b84c7fbdf5b72e5bd6403ec7 (diff)
downloadoslo-db-77cc11a526c64b24dfc91ef023abed4009b734fe.tar.gz
Merge "remove unicode from code"
Diffstat (limited to 'oslo_db')
-rw-r--r--oslo_db/sqlalchemy/test_migrations.py6
-rw-r--r--oslo_db/tests/sqlalchemy/test_sqlalchemy.py6
2 files changed, 6 insertions, 6 deletions
diff --git a/oslo_db/sqlalchemy/test_migrations.py b/oslo_db/sqlalchemy/test_migrations.py
index 07d058b..9d3a0bd 100644
--- a/oslo_db/sqlalchemy/test_migrations.py
+++ b/oslo_db/sqlalchemy/test_migrations.py
@@ -500,9 +500,9 @@ class ModelsMigrationsSync(object, metaclass=abc.ABCMeta):
[('drop_key',
'testtbl_fk_check_fkey',
'testtbl',
- fk_info(constrained_columns=(u'fk_check',),
- referred_table=u'table',
- referred_columns=(u'fk_check',)))]
+ fk_info(constrained_columns=('fk_check',),
+ referred_table='table',
+ referred_columns=('fk_check',)))]
DEPRECATED: this function is deprecated and will be removed from
oslo.db in a few releases. Alembic autogenerate.compare_metadata()
diff --git a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py
index 080f418..8a48eca 100644
--- a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py
+++ b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py
@@ -67,7 +67,7 @@ class RegexpFilterTestCase(test_base._DbTestCase):
def _test_regexp_filter(self, regexp, expected):
with enginefacade.writer.using(test_base.context):
_session = test_base.context.session
- for i in ['10', '20', u'♥']:
+ for i in ['10', '20', '♥']:
tbl = RegexpTable()
tbl.update({'bar': i})
tbl.save(session=_session)
@@ -83,10 +83,10 @@ class RegexpFilterTestCase(test_base._DbTestCase):
self._test_regexp_filter('11', [])
def test_regexp_filter_unicode(self):
- self._test_regexp_filter(u'♥', [u'♥'])
+ self._test_regexp_filter('♥', ['♥'])
def test_regexp_filter_unicode_nomatch(self):
- self._test_regexp_filter(u'♦', [])
+ self._test_regexp_filter('♦', [])
class SQLiteSavepointTest(test_base._DbTestCase):