From 333e9ee27e705ee04f1ef09f60f826e81a9dcb53 Mon Sep 17 00:00:00 2001
From: xuanyandong <xuanyandong@inspur.com>
Date: Sun, 3 Jan 2021 16:09:31 +0800
Subject: [PATCH] remove unicode from code

Change-Id: I4e4e6fc55053e9d524620022af442f1313a97446
---
 doc/source/conf.py              |  2 +-
 oslo_log/tests/unit/test_log.py | 10 +++++-----
 releasenotes/source/conf.py     |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 4ae81f6d..1e229953 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -38,7 +38,7 @@ openstackdocs_bug_tag = ''
 master_doc = 'index'
 
 # General information about the project.
-copyright = u'2014, OpenStack Foundation'
+copyright = '2014, OpenStack Foundation'
 
 # -- Options for HTML output --------------------------------------------------
 
diff --git a/oslo_log/tests/unit/test_log.py b/oslo_log/tests/unit/test_log.py
index 239fb1f1..723cffbb 100644
--- a/oslo_log/tests/unit/test_log.py
+++ b/oslo_log/tests/unit/test_log.py
@@ -624,7 +624,7 @@ class JSONFormatterTestCase(LogTestBase):
         expected = b'\\u2622'
         # see ContextFormatterTestCase.test_can_process_strings
         expected = '\\\\xe2\\\\x98\\\\xa2'
-        self.log.info(b'%s', u'\u2622'.encode('utf8'))
+        self.log.info(b'%s', '\u2622'.encode('utf8'))
         self.assertIn(expected, self.stream.getvalue())
 
     def test_exception(self):
@@ -964,7 +964,7 @@ class ContextFormatterTestCase(LogTestBase):
                                                   "%(user_identity)s]: "
                                                   "%(message)s")
         ctxt = _fake_context()
-        ctxt.request_id = u'99'
+        ctxt.request_id = '99'
         message = 'test'
         self.log.info(message, context=ctxt)
         expected = ("HAS CONTEXT [%s %s %s %s %s %s]: %s\n" %
@@ -981,7 +981,7 @@ class ContextFormatterTestCase(LogTestBase):
                     logging_user_identity_format="%(user)s "
                                                  "%(tenant)s")
         ctxt = _fake_context()
-        ctxt.request_id = u'99'
+        ctxt.request_id = '99'
         message = 'test'
         self.log.info(message, context=ctxt)
         expected = ("HAS CONTEXT [%s %s %s]: %s\n" %
@@ -1024,7 +1024,7 @@ class ContextFormatterTestCase(LogTestBase):
         # or it will fail and inserting byte string in unicode string
         # causes such formatting
         expected = '\\xe2\\x98\\xa2'
-        self.log.info(b'%s', u'\u2622'.encode('utf8'))
+        self.log.info(b'%s', '\u2622'.encode('utf8'))
         self.assertIn(expected, self.stream.getvalue())
 
     def test_dict_args_with_unicode(self):
@@ -1923,7 +1923,7 @@ class KeywordArgumentAdapterTestCase(BaseTestCase):
 
 class UnicodeConversionTestCase(BaseTestCase):
 
-    _MSG = u'Message with unicode char \ua000 in the middle'
+    _MSG = 'Message with unicode char \ua000 in the middle'
 
     def test_ascii_to_unicode(self):
         msg = self._MSG
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 627699d2..e060d4ea 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -31,7 +31,7 @@ extensions = [
 master_doc = 'index'
 
 # General information about the project.
-copyright = u'2016, oslo.log Developers'
+copyright = '2016, oslo.log Developers'
 
 # Release notes do not need a version in the title, they span
 # multiple versions.