From 3c801fe8cae153a169251f9ec21bcea3312f0171 Mon Sep 17 00:00:00 2001 From: niuke Date: Fri, 12 Aug 2022 21:56:41 +0800 Subject: [PATCH] remove unicode prefix from code Change-Id: Id83c2e9b0cb06f2aae051ba95fa7d0e7545f848e --- releasenotes/source/conf.py | 14 +++++++------- tests/test_hook_chef.py | 8 ++++---- tests/test_hook_docker_compose.py | 12 ++++++------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 8088fea..7f2e4b3 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -64,9 +64,9 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'Heat Agent Release Note' -copyright = u'2017, Heat Developers' -author = u'Heat Developers' +project = 'Heat Agent Release Note' +copyright = '2017, Heat Developers' +author = 'Heat Developers' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -148,8 +148,8 @@ latex_elements = { # author, documentclass [howto, manual, or own class]). latex_documents = [ (master_doc, 'HeatAgentReleaseNote.tex', - u'Heat Agent Release Note Documentation', - u'Heat Developers', 'manual'), + 'Heat Agent Release Note Documentation', + 'Heat Developers', 'manual'), ] @@ -159,7 +159,7 @@ latex_documents = [ # (source start file, name, description, authors, manual section). man_pages = [ (master_doc, 'heatagentreleasenote', - u'Heat Agent Release Note Documentation', + 'Heat Agent Release Note Documentation', [author], 1) ] @@ -171,7 +171,7 @@ man_pages = [ # dir menu entry, description, category) texinfo_documents = [ (master_doc, 'HeatAgentReleaseNote', - u'Heat Agent Release Note Documentation', + 'Heat Agent Release Note Documentation', author, 'HeatAgentReleaseNote', 'One line description of project.', 'Miscellaneous'), ] diff --git a/tests/test_hook_chef.py b/tests/test_hook_chef.py index 348c814..fd6374f 100644 --- a/tests/test_hook_chef.py +++ b/tests/test_hook_chef.py @@ -100,8 +100,8 @@ class HookChefTest(common.RunScriptTest): hook_chef.main(json.dumps(data)) exp_node = { 'barval': {'foo': 'biff'}, - 'fooval': {u'bar': u'baz'}, - 'run_list': [u'recipe[apache]'] + 'fooval': {'bar': 'baz'}, + 'run_list': ['recipe[apache]'] } exp_cfg = ("log_level :debug\n" "log_location STDOUT\n" @@ -197,8 +197,8 @@ class HookChefTest(common.RunScriptTest): hook_chef.main(json.dumps(data)) exp_node = { 'barval': {'foo': 'biff'}, - 'fooval': {u'bar': u'baz'}, - 'run_list': [u'recipe[apache]'] + 'fooval': {'bar': 'baz'}, + 'run_list': ['recipe[apache]'] } exp_cfg = ("log_level :debug\n" "log_location STDOUT\n" diff --git a/tests/test_hook_docker_compose.py b/tests/test_hook_docker_compose.py index 0064c96..2db9df9 100644 --- a/tests/test_hook_docker_compose.py +++ b/tests/test_hook_docker_compose.py @@ -26,12 +26,12 @@ class HookDockerComposeTest(common.RunScriptTest): "inputs": [ { "name": "env_files", - "value": u'[ { "file_name": "./common.env", ' - u'"content": "xxxxx" }, ' - u'{ "file_name": "./test.env", ' - u'"content": "yyyy" }, ' - u'{ "file_name": "./test1.env", ' - u'"content": "zzz" } ]' + "value": '[ { "file_name": "./common.env", ' + '"content": "xxxxx" }, ' + '{ "file_name": "./test.env", ' + '"content": "yyyy" }, ' + '{ "file_name": "./test1.env", ' + '"content": "zzz" } ]' } ], "config": {