remove unicode from code

Change-Id: Ia782bc7127a1cb967e2f475065b1fb963b9c184f

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

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',),
+               fk_info(constrained_columns=('fk_check',),
-                       referred_table=u'table',
+                       referred_table='table',
-                       referred_columns=(u'fk_check',)))]
+                       referred_columns=('fk_check',)))]
 
         DEPRECATED: this function is deprecated and will be removed from
         oslo.db in a few releases. Alembic autogenerate.compare_metadata()

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):

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',
+     'oslo.db Release Notes Documentation',
-     u'oslo.db Developers', 'manual'),
+     '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',
+     'oslo.db Release Notes Documentation',
-     [u'oslo.db Developers'], 1)
+     ['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',
+     'oslo.db Release Notes Documentation',
-     u'oslo.db Developers', 'oslo.configReleaseNotes',
+     'oslo.db Developers', 'oslo.configReleaseNotes',
      'An OpenStack library for parsing configuration options from the command'
      ' line and configuration files.',
      'Miscellaneous'),