Skip to content

Commit

Permalink
BaseTools:Updata the output encoding of the Popen function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
BobCF authored and lgao4 committed Aug 1, 2019
1 parent 307e165 commit 8ddec24
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion BaseTools/Source/Python/Common/Misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,7 @@ def ParseDevPathValue (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
Expand Down
2 changes: 1 addition & 1 deletion BaseTools/Source/Python/Common/VpdInfoFile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion BaseTools/Source/Python/Pkcs7Sign/Pkcs7Sign.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
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 = []

Expand Down Expand Up @@ -119,7 +119,7 @@
# 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)
Expand All @@ -132,7 +132,7 @@
#
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)
Expand Down
2 changes: 1 addition & 1 deletion BaseTools/Source/Python/Workspace/DscBuildData.py
Original file line number Diff line number Diff line change
Expand Up @@ -1735,7 +1735,7 @@ def ExecuteCommand (Command):
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):
Expand Down

0 comments on commit 8ddec24

Please sign in to comment.