Merge "remove unicode prefix from code"

2 files changed, 16 insertions, 16 deletions

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 4b60ce4a..5eb5f59f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -51,8 +51,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'OpenStack Command Line Client'
-copyright = u'2012-2013 OpenStack Foundation'
+project = 'OpenStack Command Line Client'
+copyright = '2012-2013 OpenStack Foundation'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -189,8 +189,8 @@ latex_elements = {
 # .
 latex_documents = [
     ('index', 'OpenStackCommandLineClient.tex',
-    u'OpenStack Command Line Client Documentation',
-    u'OpenStack', 'manual'),
+    'OpenStack Command Line Client Documentation',
+    'OpenStack', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -222,8 +222,8 @@ man_pages = [
     (
         'cli/man/openstack',
         'openstack',
-        u'OpenStack Command Line Client',
-        [u'OpenStack contributors'],
+        'OpenStack Command Line Client',
+        ['OpenStack contributors'],
         1,
     ),
 ]
@@ -239,8 +239,8 @@ man_pages = [
 #  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'),
 ]
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 179f8f23..35f061af 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -88,8 +88,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'OpenStackClient Release Notes'
-copyright = u'2015, OpenStackClient Developers'
+project = 'OpenStackClient Release Notes'
+copyright = '2015, OpenStackClient Developers'
 
 # Release notes are version independent.
 # The full version, including alpha/beta/rc tags.
@@ -238,8 +238,8 @@ latex_elements = {
 latex_documents = [(
     'index',
     'OpenStackClientReleaseNotes.tex',
-    u'OpenStackClient Release Notes Documentation',
-    u'OpenStackClient  Developers',
+    'OpenStackClient Release Notes Documentation',
+    'OpenStackClient  Developers',
     'manual',
 )]
 
@@ -271,8 +271,8 @@ latex_documents = [(
 man_pages = [(
     'index',
     'openstackclientreleasenotes',
-    u'OpenStackClient Release Notes Documentation',
-    [u'OpenStackClient Developers'],
+    'OpenStackClient Release Notes Documentation',
+    ['OpenStackClient Developers'],
     1,
 )]
 
@@ -288,8 +288,8 @@ man_pages = [(
 texinfo_documents = [(
     'index',
     'OpenStackClientReleaseNotes',
-    u'OpenStackclient Release Notes Documentation',
-    u'OpenStackclient Developers',
+    'OpenStackclient Release Notes Documentation',
+    'OpenStackclient Developers',
     'OpenStackClientReleaseNotes',
     'A unified command-line client for OpenStack.',
     'Miscellaneous',