BaseTools/UPT:merge UPT Tool use Python2 and Python3

In UPT Tool,merge python2 and python3

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py b/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py
index 029a436cec..c314892adf 100644
--- a/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py
+++ b/BaseTools/Source/Python/UPT/Parser/InfAsBuiltProcess.py
@@ -205,7 +205,7 @@ def GetFileLineContent(FileName, WorkSpace, LineNo, OriginalString):
 

     try:

         FullFileName = FullFileName.replace('\\', '/')

-        Inputfile = open(FullFileName, "rb", 0)

+        Inputfile = open(FullFileName, "r")

         try:

             FileLinesList = Inputfile.readlines()

         except BaseException:

@@ -247,7 +247,7 @@ def GetGuidVerFormLibInstance(Guid, Version, WorkSpace, CurrentInfFileName):
                 continue

             InfFile = InfFile.replace('\\', '/')

             if InfFile not in GlobalData.gLIBINSTANCEDICT:

-                InfFileObj = open(InfFile, "rb", 0)

+                InfFileObj = open(InfFile, "r")

                 GlobalData.gLIBINSTANCEDICT[InfFile] = InfFileObj

             else:

                 InfFileObj = GlobalData.gLIBINSTANCEDICT[InfFile]