From fbf80913644787e283b058eecd1ffd3aa9eb01b4 Mon Sep 17 00:00:00 2001
From: shanyunfan33 <shanyunfan@inspur.com>
Date: Wed, 26 Jan 2022 16:11:00 +0800
Subject: [PATCH] remove unicode from code

remove unicode from code

Change-Id: Ief9d24e83d74c1f7bf17c96abd713ee5b563361d
---
 .zuul.yaml                  |  2 +-
 api-ref/source/conf.py      |  8 ++++----
 doc/source/conf.py          |  6 +++---
 releasenotes/source/conf.py | 14 +++++++-------
 test-requirements.txt       |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 98db576b1..25d91b35f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -91,7 +91,7 @@
 
 - project:
     templates:
-      - openstack-python3-xena-jobs
+      - openstack-python3-zed-jobs
       - publish-openstack-docs-pti
       - check-requirements
       - release-notes-jobs-python3
diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py
index 63ac5dc82..33930b138 100644
--- a/api-ref/source/conf.py
+++ b/api-ref/source/conf.py
@@ -52,8 +52,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Workflow Service API Reference'
-copyright = u'2017, Mistral Contributors'
+project = 'Workflow Service API Reference'
+copyright = '2017, Mistral Contributors'
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
@@ -106,8 +106,8 @@ html_sidebars = {
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'mistral', u'Mistral',
-     [u'OpenStack Foundation'], 1)
+    ('index', 'mistral', 'Mistral',
+     ['OpenStack Foundation'], 1)
 ]
 
 # If true, show URL addresses after external links.
diff --git a/doc/source/conf.py b/doc/source/conf.py
index af61bd7ae..47d482705 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -56,7 +56,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Mistral'
-copyright = u'2020, Mistral Contributors'
+copyright = '2020, Mistral Contributors'
 
 policy_generator_config_file = \
     '../../tools/config/policy-generator.mistral.conf'
@@ -96,8 +96,8 @@ html_title = 'Mistral'
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'mistral', u'Mistral',
-     [u'OpenStack Foundation'], 1)
+    ('index', 'mistral', 'Mistral',
+     ['OpenStack Foundation'], 1)
 ]
 
 # If true, show URL addresses after external links.
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 670f7525c..f9b15808a 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -54,8 +54,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Mistral Release Notes'
-copyright = u'2015, Mistral Developers'
+project = 'Mistral Release Notes'
+copyright = '2015, Mistral Developers'
 
 # Release notes are version independent
 
@@ -200,7 +200,7 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     ('index', 'MistralReleaseNotes.tex',
-     u'Mistral Release Notes Documentation', u'Mistral Developers', 'manual'),
+     'Mistral Release Notes Documentation', 'Mistral Developers', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -229,8 +229,8 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'mistralreleasenotes', u'Mistral Release Notes Documentation',
-     [u'Mistral Developers'], 1)
+    ('index', 'mistralreleasenotes', 'Mistral Release Notes Documentation',
+     ['Mistral Developers'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -243,8 +243,8 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'MistralReleaseNotes', u'Mistral Release Notes Documentation',
-     u'Mistral Developers', 'MistralReleaseNotes',
+    ('index', 'MistralReleaseNotes', 'Mistral Release Notes Documentation',
+     'Mistral Developers', 'MistralReleaseNotes',
      'One line description of project.',
      'Miscellaneous'),
 ]
diff --git a/test-requirements.txt b/test-requirements.txt
index 1287f971a..948abceef 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,4 +14,4 @@ tempest>=21.0.0 # Apache-2.0
 stestr>=2.0.0 # Apache-2.0
 testtools>=2.2.0 # MIT
 unittest2>=1.1.0 # BSD
-
+WebTest>= 3.0.0 # Apache-2.0