remove unicode from code

Change-Id: Iadc87779bf513c9d04847b6cf8ecbc60b300d7db
Implements: blueprint remove-unicode

Author: likui

doc/source/conf.py

@@ -56,14 +56,14 @@
 
 master_doc = 'index'
 
-copyright = u'2014, OpenStack Foundation'
+copyright = '2014, OpenStack Foundation'
 
 exclude_trees = []
 
 pygments_style = 'native'
 
 htmlhelp_basename = 'python-troveclientdoc'
 latex_documents = [
-    ('index', 'python-troveclient.tex', u'python-troveclient Documentation',
-     u'OpenStack', 'manual'),
+    ('index', 'python-troveclient.tex', 'python-troveclient Documentation',
+     'OpenStack', 'manual'),
 ]

releasenotes/source/conf.py

@@ -54,8 +54,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Trove Client Release Notes'
-copyright = u'2016, Trove developers'
+project = 'Trove Client Release Notes'
+copyright = '2016, Trove developers'
 
 # Release notes are version independent.
 # The short X.Y version.
@@ -204,8 +204,8 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  ('index', 'TroveClientReleaseNotes.tex', u'Trove Client Release Notes Documentation',
-   u'Trove developers', 'manual'),
+  ('index', 'TroveClientReleaseNotes.tex', 'Trove Client Release Notes Documentation',
+   'Trove developers', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -234,8 +234,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'troveclientreleasenotes', u'Trove Client Release Notes Documentation',
-     [u'Trove developers'], 1)
+    ('index', 'troveclientreleasenotes', 'Trove Client Release Notes Documentation',
+     ['Trove developers'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -248,8 +248,8 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'TroveClientReleaseNotes', u'Trove Client Release Notes Documentation',
-   u'Trove developers', 'TroveClientReleaseNotes', 'OpenStack Database as a Service.',
+  ('index', 'TroveClientReleaseNotes', 'Trove Client Release Notes Documentation',
+   'Trove developers', 'TroveClientReleaseNotes', 'OpenStack Database as a Service.',
    'Miscellaneous'),
 ]
 

troveclient/tests/test_shell.py

@@ -65,8 +65,8 @@ def _create_ver_list(versions):
 
 class ShellTest(testtools.TestCase):
 
-    version_id = u'v2.0'
-    links = [{u'href': u'http://no.where/v2.0', u'rel': u'self'}]
+    version_id = 'v2.0'
+    links = [{'href': 'http://no.where/v2.0', 'rel': 'self'}]
 
     v2_version = fixture.V2Discovery(V2_URL)
     v2_version.updated_str = UPDATED
@@ -162,8 +162,8 @@ def test_no_auth_url(self):
             self.fail('CommandError not raised')
 
     @mock.patch('keystoneauth1.discover.get_version_data',
-                return_value=[{u'status': u'stable', u'id': version_id,
-                               u'links': links}])
+                return_value=[{'status': 'stable', 'id': version_id,
+                               'links': links}])
     @mock.patch('troveclient.v1.datastores.DatastoreVersions.list')
     @requests_mock.Mocker()
     def test_datastore_version_list(self, mock_discover,
@@ -183,8 +183,8 @@ def test_datastore_version_list(self, mock_discover,
         self.assertEqual(expected, (stdout + stderr))
 
     @mock.patch('keystoneauth1.discover.get_version_data',
-                return_value=[{u'status': u'stable', u'id': version_id,
-                               u'links': links}])
+                return_value=[{'status': 'stable', 'id': version_id,
+                               'links': links}])
     @mock.patch('troveclient.v1.datastores.Datastores.list')
     @requests_mock.Mocker()
     def test_get_datastore_list(self, mock_discover,
@@ -206,8 +206,8 @@ def test_get_datastore_list(self, mock_discover,
 
 class ShellTestKeystoneV3(ShellTest):
 
-    version_id = u'v3'
-    links = [{u'href': u'http://no.where/v3', u'rel': u'self'}]
+    version_id = 'v3'
+    links = [{'href': 'http://no.where/v3', 'rel': 'self'}]
 
     v3_version = fixture.V3Discovery(V3_URL)
     v3_version.updated_str = UPDATED
@@ -282,15 +282,15 @@ def register_keystone_discovery_fixture(self, mreq):
 
     def test_no_project_id(self):
         required = (
-            u'You must provide a '
-            u'project_id or project_name (with '
-            u'project_domain_name or project_domain_id) via '
-            u'  --os-project-id (env[OS_PROJECT_ID])'
-            u'  --os-project-name (env[OS_PROJECT_NAME]),'
-            u'  --os-project-domain-id '
-            u'(env[OS_PROJECT_DOMAIN_ID])'
-            u'  --os-project-domain-name '
-            u'(env[OS_PROJECT_DOMAIN_NAME])'
+            'You must provide a '
+            'project_id or project_name (with '
+            'project_domain_name or project_domain_id) via '
+            '  --os-project-id (env[OS_PROJECT_ID])'
+            '  --os-project-name (env[OS_PROJECT_NAME]),'
+            '  --os-project-domain-id '
+            '(env[OS_PROJECT_DOMAIN_ID])'
+            '  --os-project-domain-name '
+            '(env[OS_PROJECT_DOMAIN_NAME])'
         )
         self.make_env(exclude='OS_PROJECT_ID')
         try:
@@ -301,8 +301,8 @@ def test_no_project_id(self):
             self.fail('CommandError not raised')
 
     @mock.patch('keystoneauth1.discover.get_version_data',
-                return_value=[{u'status': u'stable', u'id': version_id,
-                               u'links': links}])
+                return_value=[{'status': 'stable', 'id': version_id,
+                               'links': links}])
     @mock.patch('troveclient.v1.datastores.DatastoreVersions.list')
     @requests_mock.Mocker()
     def test_datastore_version_list(self, mock_discover,
@@ -323,8 +323,8 @@ def test_datastore_version_list(self, mock_discover,
         self.assertEqual(expected, (stdout + stderr))
 
     @mock.patch('keystoneauth1.discover.get_version_data',
-                return_value=[{u'status': u'stable', u'id': version_id,
-                               u'links': links}])
+                return_value=[{'status': 'stable', 'id': version_id,
+                               'links': links}])
     @mock.patch('troveclient.v1.datastores.Datastores.list')
     @requests_mock.Mocker()
     def test_get_datastore_list(self, mock_discover,
@@ -345,8 +345,8 @@ def test_get_datastore_list(self, mock_discover,
         self.assertEqual(expected, (stdout + stderr))
 
     @mock.patch('keystoneauth1.discover.get_version_data',
-                return_value=[{u'status': u'stable', u'id': version_id,
-                               u'links': links}])
+                return_value=[{'status': 'stable', 'id': version_id,
+                               'links': links}])
     @requests_mock.Mocker()
     def test_invalid_client_version(self, mock_discover,
                                     mock_requests):