From bd0674c0d0920b9d88ae11ced057e5f4a426fa37 Mon Sep 17 00:00:00 2001 From: Gavin Mak Date: Fri, 27 Aug 2021 20:10:36 +0000 Subject: [PATCH] Fix remaining unicode py2+3 recipe module errors Bug: 1227140 Change-Id: Ic29fff7556884935c301b35ba3995e281f178540 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3124901 Reviewed-by: Anthony Polito Commit-Queue: Gavin Mak --- recipes/recipe_modules/git/api.py | 2 +- recipes/recipe_modules/git_cl/examples/full.py | 8 +++++--- recipes/recipe_modules/tryserver/api.py | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/recipes/recipe_modules/git/api.py b/recipes/recipe_modules/git/api.py index 50b10d67f..b6c61023b 100644 --- a/recipes/recipe_modules/git/api.py +++ b/recipes/recipe_modules/git/api.py @@ -215,7 +215,7 @@ class GitApi(recipe_api.RecipeApi): stdout=self.m.raw_io.output(), step_test_data=lambda: self.m.raw_io.test_api.stream_output('mirror_dir')) - mirror_dir = dir_cmd.stdout.strip() + mirror_dir = dir_cmd.stdout.strip().decode('utf-8') self('remote', 'set-url', 'origin', mirror_dir, can_fail_build=can_fail_build) diff --git a/recipes/recipe_modules/git_cl/examples/full.py b/recipes/recipe_modules/git_cl/examples/full.py index 204c59e65..da4e8f51a 100644 --- a/recipes/recipe_modules/git_cl/examples/full.py +++ b/recipes/recipe_modules/git_cl/examples/full.py @@ -24,16 +24,18 @@ def RunSteps(api): suffix='build') api.git_cl.set_description( 'bammmm', patch_url='https://code.review/123') - api.step('echo', ['echo', result.stdout]) + api.step('echo', ['echo', result.stdout.decode('utf-8')]) api.git_cl.set_config('basic') api.git_cl.c.repo_location = api.path.mkdtemp('fakerepo') - api.step('echo', ['echo', api.git_cl.get_description().stdout]) + api.step( + 'echo', ['echo', api.git_cl.get_description().stdout.decode('utf-8')]) api.git_cl.set_description('new description woo') - api.step('echo', ['echo', api.git_cl.get_description().stdout]) + api.step( + 'echo', ['echo', api.git_cl.get_description().stdout.decode('utf-8')]) def GenTests(api): yield ( diff --git a/recipes/recipe_modules/tryserver/api.py b/recipes/recipe_modules/tryserver/api.py index 491be6bf8..cdce52a0c 100644 --- a/recipes/recipe_modules/tryserver/api.py +++ b/recipes/recipe_modules/tryserver/api.py @@ -231,7 +231,7 @@ class TryserverApi(recipe_api.RecipeApi): step_test_data=lambda: self.m.raw_io.test_api.stream_output('foo.cc'), **kwargs) - paths = [self.m.path.join(patch_root, p) for p in + paths = [self.m.path.join(patch_root, p.decode('utf-8')) for p in step_result.stdout.split()] paths.sort() if self.m.platform.is_win: