Dropping explicit unicode literal

In python 3, all strings are considered as unicode string.

This patch drops the explicit unicode literal (u'...')
or (u"..") appearances from the unicode strings.

Change-Id: I9902966892a1dc4f85d449dfe580fb128647487b

3 files changed, 19 insertions, 19 deletions

diff --git a/cinderclient/tests/unit/v2/fakes.py b/cinderclient/tests/unit/v2/fakes.py
index 99a87d0..ddd20c5 100644
--- a/cinderclient/tests/unit/v2/fakes.py
+++ b/cinderclient/tests/unit/v2/fakes.py
@@ -28,9 +28,9 @@ REQUEST_ID = 'req-test-request-id'
 def _stub_volume(*args, **kwargs):
     volume = {
         "migration_status": None,
-        "attachments": [{u'server_id': u'1234',
-                         u'id': u'3f88836f-adde-4296-9f6b-2c59a0bcda9a',
-                         u'attachment_id': u'5678'}],
+        "attachments": [{'server_id': '1234',
+                         'id': '3f88836f-adde-4296-9f6b-2c59a0bcda9a',
+                         'attachment_id': '5678'}],
         "links": [
             {
                 "href": "http://localhost/v2/fake/volumes/1234",
@@ -741,7 +741,7 @@ class FakeHTTPClient(base_client.HTTPClient):
         return (200, {}, {'volume_type': {'id': 1,
                           'name': 'test-type-1',
                           'description': 'test_type-1-desc',
-                          'extra_specs': {u'key': u'value'}}})
+                          'extra_specs': {'key': 'value'}}})
 
     def get_types_2(self, **kw):
         return (200, {}, {'volume_type': {'id': 2,
@@ -1317,9 +1317,9 @@ class FakeHTTPClient(base_client.HTTPClient):
                 'storage_protocol': 'iSCSI',
                 'properties': {
                     'compression': {
-                        u'title': u'Compression',
-                        u'description': u'Enables compression.',
-                        u'type': u'boolean'},
+                        'title': 'Compression',
+                        'description': 'Enables compression.',
+                        'type': 'boolean'},
                 }
             }
         )
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 2868e84..0c5ce55 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -81,8 +81,8 @@ html_theme = 'openstackdocs'
 # -- Options for manual page output ------------------------------------------
 
 man_pages = [
-    ('cli/details', 'cinder', u'Client for OpenStack Block Storage API',
-     [u'OpenStack Contributors'], 1),
+    ('cli/details', 'cinder', 'Client for OpenStack Block Storage API',
+     ['OpenStack Contributors'], 1),
 ]
 
 # -- Options for openstackdocstheme -------------------------------------------
@@ -104,8 +104,8 @@ openstackdocs_pdf_link = True
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
 latex_documents = [
-    ('index', 'doc-python-cinderclient.tex', u'Cinder Client Documentation',
-     u'Cinder Contributors', 'manual'),
+    ('index', 'doc-python-cinderclient.tex', 'Cinder Client Documentation',
+     'Cinder Contributors', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 58ed268..a0a7d09 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -55,9 +55,9 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Cinder Client Release Notes'
+project = 'Cinder Client Release Notes'
 openstackdocs_auto_name = False
-copyright = u'2015, Cinder Developers'
+copyright = '2015, Cinder Developers'
 
 # Release notes are version independent, no need to set version and release
 release = ''
@@ -201,8 +201,8 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     ('index', 'CinderClientReleaseNotes.tex',
-     u'Cinder Client Release Notes Documentation',
-     u'Cinder Developers', 'manual'),
+     'Cinder Client Release Notes Documentation',
+     'Cinder Developers', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -232,8 +232,8 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'cinderclientreleasenotes',
-     u'Cinder Client Release Notes Documentation',
-     [u'Cinder Developers'], 1)
+     'Cinder Client Release Notes Documentation',
+     ['Cinder Developers'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -247,8 +247,8 @@ man_pages = [
 #  dir menu entry, description, category)
 texinfo_documents = [
     ('index', 'CinderClientReleaseNotes',
-     u'Cinder Client Release Notes Documentation',
-     u'Cinder Developers', 'CinderClientReleaseNotes',
+     'Cinder Client Release Notes Documentation',
+     'Cinder Developers', 'CinderClientReleaseNotes',
      'Block Storage Service client.',
      'Miscellaneous'),
 ]