Merge "remove unicode prefix from code"

manila_tempest_tests/tests/api/test_share_group_actions.py

@@ -481,8 +481,8 @@ class ShareGroupRenameTest(base.BaseSharesMixedTest):
     def test_create_update_read_share_group_with_unicode(self, version):
         utils.check_skip_if_microversion_not_supported(version)
 
-        value1 = u'ಠ_ಠ'
-        value2 = u'ಠ_ರೃ'
+        value1 = 'ಠ_ಠ'
+        value2 = 'ಠ_ರೃ'
 
         # Create share_group
         share_group = self.create_share_group(

releasenotes/source/conf.py

@@ -52,8 +52,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'manila-tempest-plugin Release Notes'
-copyright = u'2017, OpenStack Developers'
+project = 'manila-tempest-plugin Release Notes'
+copyright = '2017, OpenStack Developers'
 
 # openstackdocstheme options
 repository_name = 'openstack/manila-tempest-plugin'
@@ -212,8 +212,8 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     ('index', 'ManilaTempestPluginReleaseNotes.tex',
-     u'manila-tempest-plugin  Release Notes Documentation',
-     u'OpenStack Foundation', 'manual'),
+     'manila-tempest-plugin  Release Notes Documentation',
+     'OpenStack Foundation', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -243,8 +243,8 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'manila-tempest-pluginrereleasenotes',
-     u'manila-tempest-plugin  Release Notes Documentation',
-     [u'OpenStack Foundation'], 1)
+     'manila-tempest-plugin  Release Notes Documentation',
+     ['OpenStack Foundation'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -258,8 +258,8 @@ man_pages = [
 #  dir menu entry, description, category)
 texinfo_documents = [
     ('index', 'manila-tempest-plugin ReleaseNotes',
-     u'manila-tempest-plugin Release Notes Documentation',
-     u'OpenStack Foundation', 'manila-tempest-pluginReleaseNotes',
+     'manila-tempest-plugin Release Notes Documentation',
+     'OpenStack Foundation', 'manila-tempest-pluginReleaseNotes',
      'One line description of project.',
      'Miscellaneous'),
 ]