From 2d610d0abc27e170ad7e785eebac32c79c17d118 Mon Sep 17 00:00:00 2001
From: songwenping <songwenping@inspur.com>
Date: Tue, 19 Apr 2022 15:01:09 +0800
Subject: [PATCH] Remove unnecessary unicode prefixes

All strings are unicode by default in Python 3. No need to mark them as such.

Change-Id: If2b75ca342bf613d9c1bc3f34f6afcf51a22d640
---
 doc/source/conf.py                         |  8 ++++----
 oslo_cache/tests/unit/test_cache_basics.py |  2 +-
 releasenotes/source/conf.py                | 16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 827d8d02..d347857a 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -46,8 +46,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'oslo.cache'
-copyright = u'2014, OpenStack Foundation'
+project = 'oslo.cache'
+copyright = '2014, OpenStack Foundation'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 add_function_parentheses = True
@@ -79,8 +79,8 @@ htmlhelp_basename = '%sdoc' % project
 latex_documents = [
     ('index',
      '%s.tex' % project,
-     u'%s Documentation' % project,
-     u'OpenStack Foundation', 'manual'),
+     '%s Documentation' % project,
+     'OpenStack Foundation', 'manual'),
 ]
 
 intersphinx_mapping = {
diff --git a/oslo_cache/tests/unit/test_cache_basics.py b/oslo_cache/tests/unit/test_cache_basics.py
index bb8d48b7..866b5b5c 100644
--- a/oslo_cache/tests/unit/test_cache_basics.py
+++ b/oslo_cache/tests/unit/test_cache_basics.py
@@ -636,7 +636,7 @@ class CacheRegionTest(test_cache.BaseTestCase):
 class UTF8KeyManglerTests(test_cache.BaseTestCase):
 
     def test_key_is_utf8_encoded(self):
-        key = u'fäké1'
+        key = 'fäké1'
         encoded = cache._sha1_mangle_key(key)
         self.assertIsNotNone(encoded)
 
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index c556487f..29f5c14f 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -58,8 +58,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'oslo.cache Release Notes'
-copyright = u'2016, oslo.cache Developers'
+project = 'oslo.cache Release Notes'
+copyright = '2016, oslo.cache Developers'
 
 # Release notes do not need a version in the title, they span
 # multiple versions.
@@ -208,8 +208,8 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     ('index', 'oslo.cacheReleaseNotes.tex',
-     u'oslo.cache Release Notes Documentation',
-     u'oslo.cache Developers', 'manual'),
+     'oslo.cache Release Notes Documentation',
+     'oslo.cache Developers', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -238,8 +238,8 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'oslo.cacheReleaseNotes',
-     u'oslo.cache Release Notes Documentation',
-     [u'oslo.cache Developers'], 1)
+     'oslo.cache Release Notes Documentation',
+     ['oslo.cache Developers'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -252,8 +252,8 @@ man_pages = [
 #  dir menu entry, description, category)
 texinfo_documents = [
     ('index', 'oslo.cacheReleaseNotes',
-     u'oslo.cache Release Notes Documentation',
-     u'oslo.cache Developers', 'oslo.cacheReleaseNotes',
+     'oslo.cache Release Notes Documentation',
+     'oslo.cache Developers', 'oslo.cacheReleaseNotes',
      'One line description of project.',
      'Miscellaneous'),
 ]