Merge "remove unicode from code"

3 files changed, 13 insertions, 13 deletions

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 5616d7a57..f9f9af990 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -37,8 +37,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'kolla'
-copyright = u'2013-present, OpenStack Foundation'
+project = 'kolla'
+copyright = '2013-present, OpenStack Foundation'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 add_function_parentheses = True
@@ -71,8 +71,8 @@ htmlhelp_basename = '%sdoc' % project
 latex_documents = [
     ('index',
      'doc-%s.tex' % project,
-     u'%s Documentation' % project,
-     u'OpenStack Foundation', 'manual'),
+     '%s Documentation' % project,
+     'OpenStack Foundation', 'manual'),
 ]
 
 # Disable usage of xindy https://bugzilla.redhat.com/show_bug.cgi?id=1643664
diff --git a/docker/swift/swift-base/swift-rootwrap b/docker/swift/swift-base/swift-rootwrap
index 5fe6099a5..9432582da 100644
--- a/docker/swift/swift-base/swift-rootwrap
+++ b/docker/swift/swift-base/swift-rootwrap
@@ -1,5 +1,5 @@
 #!/usr/bin/python3
-# PBR Generated from u'console_scripts'
+# PBR Generated from 'console_scripts'
 
 import sys
 
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 86705c7f5..84353cda6 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -45,8 +45,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Kolla Release Notes'
-copyright = u'2015, Kolla developers'
+project = 'Kolla Release Notes'
+copyright = '2015, Kolla developers'
 
 # Release notes are version independent.
 # The short X.Y version.
@@ -184,8 +184,8 @@ htmlhelp_basename = 'KollaReleaseNotesdoc'
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    ('index', 'KollaReleaseNotes.tex', u'Kolla Release Notes Documentation',
-     u'Kolla developers', 'manual'),
+    ('index', 'KollaReleaseNotes.tex', 'Kolla Release Notes Documentation',
+     'Kolla developers', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -214,8 +214,8 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'kollareleasenotes', u'Kolla Release Notes Documentation',
-     [u'Kolla developers'], 1)
+    ('index', 'kollareleasenotes', 'Kolla Release Notes Documentation',
+     ['Kolla developers'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -228,8 +228,8 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'KollaReleaseNotes', u'Kolla Release Notes Documentation',
-     u'Kolla developers', 'KollaReleaseNotes',
+    ('index', 'KollaReleaseNotes', 'Kolla Release Notes Documentation',
+     'Kolla developers', 'KollaReleaseNotes',
      'One line description of project.', 'Miscellaneous'),
 ]