diff options
| -rw-r--r-- | doc/source/conf.py | 2 | ||||
| -rw-r--r-- | oslo_db/sqlalchemy/test_migrations.py | 6 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_sqlalchemy.py | 6 | ||||
| -rw-r--r-- | releasenotes/source/conf.py | 14 |
4 files changed, 14 insertions, 14 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index 7006f0d..cc9cfc6 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -33,7 +33,7 @@ openstackdocs_bug_tag = '' master_doc = 'index' # General information about the project. -copyright = u'2014, OpenStack Foundation' +copyright = '2014, OpenStack Foundation' # If true, '()' will be appended to :func: etc. cross-reference text. add_function_parentheses = True 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): diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index efef05f..1705dd2 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -59,7 +59,7 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -copyright = u'2016, oslo.db Developers' +copyright = '2016, oslo.db Developers' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -188,8 +188,8 @@ htmlhelp_basename = 'oslo.configReleaseNotesdoc' # author, documentclass [howto, manual, or own class]). latex_documents = [ ('index', 'oslo.configReleaseNotes.tex', - u'oslo.db Release Notes Documentation', - u'oslo.db Developers', 'manual'), + 'oslo.db Release Notes Documentation', + 'oslo.db Developers', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -219,8 +219,8 @@ latex_documents = [ # (source start file, name, description, authors, manual section). man_pages = [ ('index', 'oslo.configreleasenotes', - u'oslo.db Release Notes Documentation', - [u'oslo.db Developers'], 1) + 'oslo.db Release Notes Documentation', + ['oslo.db Developers'], 1) ] # If true, show URL addresses after external links. @@ -234,8 +234,8 @@ man_pages = [ # dir menu entry, description, category) texinfo_documents = [ ('index', 'oslo.dbReleaseNotes', - u'oslo.db Release Notes Documentation', - u'oslo.db Developers', 'oslo.configReleaseNotes', + 'oslo.db Release Notes Documentation', + 'oslo.db Developers', 'oslo.configReleaseNotes', 'An OpenStack library for parsing configuration options from the command' ' line and configuration files.', 'Miscellaneous'), |