From 00f86d89ab7039922904d16b499e71aa34f99545 Mon Sep 17 00:00:00 2001 From: Zhijux Fan Date: Wed, 28 Nov 2018 11:12:37 +0800 Subject: [PATCH] BaseTools: replace get_bytes_le() to bytes_le UUID does not have the get_bytes_le() in python3 Cc: Bob Feng Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Zhiju.Fan Tested-by: Laszlo Ersek Tested-by: Ard Biesheuvel Reviewed-by: Liming Gao Reviewed-by: Bob Feng --- BaseTools/Source/Python/Common/Misc.py | 2 +- BaseTools/Source/Python/GenFds/CapsuleData.py | 2 +- BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py index 01bd62a9e2..2ef8e07839 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -1180,7 +1180,7 @@ def ParseFieldValue (Value): if Value[0] == '"' and Value[-1] == '"': Value = Value[1:-1] try: - Value = "'" + uuid.UUID(Value).get_bytes_le() + "'" + Value = "'" + uuid.UUID(Value).bytes_le + "'" except ValueError as Message: raise BadExpression(Message) Value, Size = ParseFieldValue(Value) diff --git a/BaseTools/Source/Python/GenFds/CapsuleData.py b/BaseTools/Source/Python/GenFds/CapsuleData.py index 6071e9f4a5..db201c074b 100644 --- a/BaseTools/Source/Python/GenFds/CapsuleData.py +++ b/BaseTools/Source/Python/GenFds/CapsuleData.py @@ -229,7 +229,7 @@ class CapsulePayload(CapsuleData): ) if AuthData: Buffer += pack('QIHH', AuthData[0], AuthData[1], AuthData[2], AuthData[3]) - Buffer += uuid.UUID(AuthData[4]).get_bytes_le() + Buffer += uuid.UUID(AuthData[4]).bytes_le # # Append file content to the structure diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py index 3fd7eefd6a..370ae2e3fa 100644 --- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py +++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256Sign.py @@ -186,7 +186,7 @@ if __name__ == '__main__': # Write output file that contains hash GUID, Public Key, Signature, and Input data # args.OutputFile = open(args.OutputFileName, 'wb') - args.OutputFile.write(EFI_HASH_ALGORITHM_SHA256_GUID.get_bytes_le()) + args.OutputFile.write(EFI_HASH_ALGORITHM_SHA256_GUID.bytes_le) args.OutputFile.write(PublicKey) args.OutputFile.write(Signature) args.OutputFile.write(args.InputFileBuffer) -- 2.39.2