From patchwork Fri May 22 02:29:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 246216 List-Id: U-Boot discussion From: sjg at chromium.org (Simon Glass) Date: Thu, 21 May 2020 20:29:01 -0600 Subject: [PATCH v3 2/5] patman: Avoid circular dependency between command and tools In-Reply-To: <20200522022904.239301-1-sjg@chromium.org> References: <20200522022904.239301-1-sjg@chromium.org> Message-ID: <20200522022904.239301-2-sjg@chromium.org> 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 --- Changes in v3: None Changes in v2: None 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 e67ac159e5a..bf8ea6c8c3c 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