Merge branch '2020-06-03-misc-bugfixes'

[oweals/u-boot.git] / tools / patman / cros_subprocess.py

diff --git a/tools/patman/cros_subprocess.py b/tools/patman/cros_subprocess.py
index 7c760143407b9fe36667312db1ea73f11059073c..efd0a5aaf72f04d9f7ffb963b0a2045910dab920 100644 (file)
--- a/tools/patman/cros_subprocess.py
+++ b/tools/patman/cros_subprocess.py
@@ -6,11 +6,11 @@
 # Licensed to PSF under a Contributor Agreement.
 # See http://www.python.org/2.4/license for licensing details.
 
 # Licensed to PSF under a Contributor Agreement.
 # See http://www.python.org/2.4/license for licensing details.
 

-"""Subprocress execution
+"""Subprocess execution

 
 This module holds a subclass of subprocess.Popen with our own required
 features, mainly that we get access to the subprocess output while it
 
 This module holds a subclass of subprocess.Popen with our own required
 features, mainly that we get access to the subprocess output while it

-is running rather than just at the end. This makes it easiler to show
+is running rather than just at the end. This makes it easier to show

 progress information and filter output in real time.
 """
 
 progress information and filter output in real time.
 """
 


@@ -100,6 +100,19 @@ class Popen(subprocess.Popen):
         if kwargs:
             raise ValueError("Unit tests do not test extra args - please add tests")
 
         if kwargs:
             raise ValueError("Unit tests do not test extra args - please add tests")
 

+    def ConvertData(self, data):
+        """Convert stdout/stderr data to the correct format for output
+
+        Args:
+            data: Data to convert, or None for ''
+
+        Returns:
+            Converted data, as bytes
+        """
+        if data is None:
+            return b''
+        return data
+

     def CommunicateFilter(self, output):
         """Interact with process: Read data from stdout and stderr.
 
     def CommunicateFilter(self, output):
         """Interact with process: Read data from stdout and stderr.
 


@@ -156,11 +169,11 @@ class Popen(subprocess.Popen):
                 self.stdin.close()
         if self.stdout:
             read_set.append(self.stdout)
                 self.stdin.close()
         if self.stdout:
             read_set.append(self.stdout)

-            stdout = []
+            stdout = b''

         if self.stderr and self.stderr != self.stdout:
             read_set.append(self.stderr)
         if self.stderr and self.stderr != self.stdout:
             read_set.append(self.stderr)

-            stderr = []
-        combined = []
+            stderr = b''
+        combined = b''

 
         input_offset = 0
         while read_set or write_set:
 
         input_offset = 0
         while read_set or write_set:


@@ -186,50 +199,40 @@ class Popen(subprocess.Popen):
                     write_set.remove(self.stdin)
 
             if self.stdout in rlist:
                     write_set.remove(self.stdin)
 
             if self.stdout in rlist:

-                data = ""
+                data = b''

                 # We will get an error on read if the pty is closed
                 try:
                     data = os.read(self.stdout.fileno(), 1024)
                 # We will get an error on read if the pty is closed
                 try:
                     data = os.read(self.stdout.fileno(), 1024)

-                    if isinstance(data, bytes):
-                        data = data.decode('utf-8')

                 except OSError:
                     pass
                 except OSError:
                     pass

-                if data == "":
+                if not len(data):

                     self.stdout.close()
                     read_set.remove(self.stdout)
                 else:
                     self.stdout.close()
                     read_set.remove(self.stdout)
                 else:

-                    stdout.append(data)
-                    combined.append(data)
+                    stdout += data
+                    combined += data

                     if output:
                         output(sys.stdout, data)
             if self.stderr in rlist:
                     if output:
                         output(sys.stdout, data)
             if self.stderr in rlist:

-                data = ""
+                data = b''

                 # We will get an error on read if the pty is closed
                 try:
                     data = os.read(self.stderr.fileno(), 1024)
                 # We will get an error on read if the pty is closed
                 try:
                     data = os.read(self.stderr.fileno(), 1024)

-                    if isinstance(data, bytes):
-                        data = data.decode('utf-8')

                 except OSError:
                     pass
                 except OSError:
                     pass

-                if data == "":
+                if not len(data):

                     self.stderr.close()
                     read_set.remove(self.stderr)
                 else:
                     self.stderr.close()
                     read_set.remove(self.stderr)
                 else:

-                    stderr.append(data)
-                    combined.append(data)
+                    stderr += data
+                    combined += data

                     if output:
                         output(sys.stderr, data)
 
         # All data exchanged.    Translate lists into strings.
                     if output:
                         output(sys.stderr, data)
 
         # All data exchanged.    Translate lists into strings.

-        if stdout is not None:
-            stdout = ''.join(stdout)
-        else:
-            stdout = ''
-        if stderr is not None:
-            stderr = ''.join(stderr)
-        else:
-            stderr = ''
-        combined = ''.join(combined)
+        stdout = self.ConvertData(stdout)
+        stderr = self.ConvertData(stderr)
+        combined = self.ConvertData(combined)

 
         # Translate newlines, if requested.    We cannot let the file
         # object do the translation: It is based on stdio, which is
 
         # Translate newlines, if requested.    We cannot let the file
         # object do the translation: It is based on stdio, which is