BaseTools:Updata the output encoding of the Popen function

BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=2015

Not all output works in utf-8, so change the encoding to
the default

This patch is going to fix that issue.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

5 files changed, 7 insertions, 7 deletions

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 27dbdace42..1caa184eb9 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1087,7 +1087,7 @@ def ParseFieldValue (Value):
             p.stderr.close()

         if err:

             raise BadExpression("DevicePath: %s" % str(err))

-        out = out.decode(encoding='utf-8', errors='ignore')

+        out = out.decode()

         Size = len(out.split())

         out = ','.join(out.split())

         return '{' + out + '}', Size

diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Source/Python/Common/VpdInfoFile.py
index bc69a9010d..4249b9f899 100644
--- a/BaseTools/Source/Python/Common/VpdInfoFile.py
+++ b/BaseTools/Source/Python/Common/VpdInfoFile.py
@@ -243,7 +243,7 @@ def CallExtenalBPDGTool(ToolPath, VpdFileName):
     except Exception as X:

         EdkLogger.error("BPDG", BuildToolError.COMMAND_FAILURE, ExtraData=str(X))

     (out, error) = PopenObject.communicate()

-    print(out.decode(encoding='utf-8', errors='ignore'))

+    print(out.decode())

     while PopenObject.returncode is None :

         PopenObject.wait()

 

diff --git a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py b/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py
index 5630df55df..5d4c3a8599 100644
--- a/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py
+++ b/BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py
@@ -116,7 +116,7 @@ if __name__ == '__main__':
   if Process.returncode != 0:

     print('ERROR: Open SSL command not available.  Please verify PATH or set OPENSSL_PATH')

     sys.exit(Process.returncode)

-  print(Version[0].decode(encoding='utf-8', errors='ignore'))

+  print(Version[0].decode())

 

   #

   # Read input file into a buffer and save input filename

diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
index f9aed2bf86..6c9b8c464e 100644
--- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
+++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
@@ -78,7 +78,7 @@ if __name__ == '__main__':
   if Process.returncode != 0:

     print('ERROR: Open SSL command not available.  Please verify PATH or set OPENSSL_PATH')

     sys.exit(Process.returncode)

-  print(Version[0].decode(encoding='utf-8', errors='ignore'))

+  print(Version[0].decode())

 

   args.PemFileName = []

 

@@ -119,7 +119,7 @@ if __name__ == '__main__':
     # Extract public key from private key into STDOUT

     #

     Process = subprocess.Popen('%s rsa -in %s -modulus -noout' % (OpenSslCommand, Item), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)

-    PublicKeyHexString = Process.communicate()[0].decode(encoding='utf-8', errors='ignore').split(b'=')[1].strip()

+    PublicKeyHexString = Process.communicate()[0].decode().split(b'=')[1].strip()

     if Process.returncode != 0:

       print('ERROR: Unable to extract public key from private key')

       sys.exit(Process.returncode)

@@ -132,7 +132,7 @@ if __name__ == '__main__':
     #

     Process = subprocess.Popen('%s dgst -sha256 -binary' % (OpenSslCommand), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)

     Process.stdin.write (PublicKey)

-    PublicKeyHash = PublicKeyHash + Process.communicate()[0].decode(encoding='utf-8', errors='ignore')

+    PublicKeyHash = PublicKeyHash + Process.communicate()[0].decode()

     if Process.returncode != 0:

       print('ERROR: Unable to extract SHA 256 hash of public key')

       sys.exit(Process.returncode)

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 985f877525..620e48fa7f 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -1735,7 +1735,7 @@ class DscBuildData(PlatformBuildClassObject):
         except:

             EdkLogger.error('Build', COMMAND_FAILURE, 'Can not execute command: %s' % Command)

         Result = Process.communicate()

-        return Process.returncode, Result[0].decode(encoding='utf-8', errors='ignore'), Result[1].decode(encoding='utf-8', errors='ignore')

+        return Process.returncode, Result[0].decode(), Result[1].decode()

 

     @staticmethod

     def IntToCString(Value, ValueSize):