Merge "remove unicode prefix from code"

doc/source/conf.py

@@ -51,7 +51,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'OpenStackClient CLI Base'
+project = 'OpenStackClient CLI Base'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -186,8 +186,8 @@ latex_elements = {
 # .
 latex_documents = [
     ('index', 'OpenStackCommandLineClient.tex',
-    u'OpenStack Command Line Client Documentation',
-    u'OpenStack'),
+    'OpenStack Command Line Client Documentation',
+    'OpenStack'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -228,8 +228,8 @@ latex_documents = [
 #  dir menu entry, description, category)
 texinfo_documents = [
     ('index', 'OpenStackCommandLineClient',
-    u'OpenStack Command Line Client Documentation',
-    u'OpenStack', 'OpenStackCommandLineClient',
+    'OpenStack Command Line Client Documentation',
+    'OpenStack', 'OpenStackCommandLineClient',
      'One line description of project.',
      'Miscellaneous'),
 ]

releasenotes/source/conf.py

@@ -87,8 +87,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'osc-lib Release Notes'
-copyright = u'2016, osc-lib Developers'
+project = 'osc-lib Release Notes'
+copyright = '2016, osc-lib Developers'
 
 # openstackdocstheme options
 openstackdocs_repo_name = 'openstack/osc-lib'
@@ -262,8 +262,8 @@ latex_elements = {
 latex_documents = [(
     'index',
     'OSC_LIBReleaseNotes.tex',
-    u'osc-lib Release Notes Documentation',
-    u'osc-lib Developers',
+    'osc-lib Release Notes Documentation',
+    'osc-lib Developers',
     'manual'),
 ]
 
@@ -301,8 +301,8 @@ latex_documents = [(
 man_pages = [(
     'index',
     'osc_libreleasenotes',
-    u'osc-lib Release Notes Documentation',
-    [u'osc-lib Developers'],
+    'osc-lib Release Notes Documentation',
+    ['osc-lib Developers'],
     1,
 )]
 
@@ -319,8 +319,8 @@ man_pages = [(
 texinfo_documents = [(
     'index',
     'OSC_LIBReleaseNotes',
-    u'osc-lib Release Notes Documentation',
-    u'osc-lib Developers',
+    'osc-lib Release Notes Documentation',
+    'osc-lib Developers',
     'OSC_LIBReleaseNotes',
     'Common base library for OpenStackClient plugins.',
     'Miscellaneous',