From 0944818a1972b07b09b53a2a1e88295cd92361cf Mon Sep 17 00:00:00 2001 From: "Carsey, Jaben" Date: Thu, 29 Mar 2018 08:02:17 +0800 Subject: BaseTools: no need to do int() API work for it int() with base=0 will already auto determine base from preceeding 0x/0X Cc: Yonghong Zhu Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey Reviewed-by: Yonghong Zhu --- BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py') diff --git a/BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py b/BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py index 0c8009cb0b..0664d6a90f 100644 --- a/BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py +++ b/BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py @@ -110,10 +110,7 @@ def PatchBinaryFile(FileName, ValueOffset, TypeName, ValueString, MaxSize=0): ValueNumber = 1 elif ValueString == 'FALSE': ValueNumber = 0 - elif ValueString.startswith('0X'): - ValueNumber = int (ValueString, 16) - else: - ValueNumber = int (ValueString) + ValueNumber = int (ValueString, 0) if ValueNumber != 0: ValueNumber = 1 except: @@ -127,10 +124,7 @@ def PatchBinaryFile(FileName, ValueOffset, TypeName, ValueString, MaxSize=0): # Get PCD value for UINT* data type # try: - if ValueString.startswith('0X'): - ValueNumber = int (ValueString, 16) - else: - ValueNumber = int (ValueString) + ValueNumber = int (ValueString, 0) except: return PARAMETER_INVALID, "PCD Value %s is not valid dec or hex string." % (ValueString) # -- cgit v1.2.3