diff mbox series

patman: Avoid circular dependency between command and tools

Message ID 20200516230206.112556-1-sjg@chromium.org
State Superseded
Headers show
Series patman: Avoid circular dependency between command and tools | expand

Commit Message

Simon Glass May 16, 2020, 11:02 p.m. UTC
This seems to cause problems in some cases. Split the dependency by
copying the code to command.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 tools/patman/command.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Comments

Simon Glass May 17, 2020, 2:08 a.m. UTC | #1
Reported-by: Stefan Bosch <stefan_b at posteo.net>

On Sat, 16 May 2020 at 17:02, Simon Glass <sjg at chromium.org> wrote:
>
> This seems to cause problems in some cases. Split the dependency by
> copying the code to command.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
>  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.26.2.761.g0e0b3e54be-goog
>
diff mbox series

Patch

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