From ddd65b01561d6941f78363751d9713bc4cbb0cd1 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 7 Jun 2020 06:45:46 -0600 Subject: [PATCH] patman: Avoid circular dependency between command and tools This seems to cause problems in some cases. Split the dependency by copying the code to command. Reported-by: Stefan Bosch Signed-off-by: Simon Glass --- tools/patman/command.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/patman/command.py b/tools/patman/command.py index e67ac159e5..bf8ea6c8c3 100644 --- a/tools/patman/command.py +++ b/tools/patman/command.py @@ -5,7 +5,6 @@ import os from patman import cros_subprocess -from patman import tools """Shell command ease-ups for Python.""" @@ -35,9 +34,9 @@ class CommandResult: def ToOutput(self, binary): if not binary: - self.stdout = tools.ToString(self.stdout) - self.stderr = tools.ToString(self.stderr) - self.combined = tools.ToString(self.combined) + self.stdout = self.stdout.decode('utf-8') + self.stderr = self.stderr.decode('utf-8') + self.combined = self.combined.decode('utf-8') return self -- 2.39.5