BaseTools: Fix old python2 idioms

Based on "futurize -f lib2to3.fixes.fix_idioms"

* Change some type comparisons to isinstance() calls:
    type(x) == T -> isinstance(x, T)
    type(x) is T -> isinstance(x, T)
    type(x) != T -> not isinstance(x, T)
    type(x) is not T -> not isinstance(x, T)

* Change "while 1:" into "while True:".

* Change both

    v = list(EXPR)
    v.sort()
    foo(v)

and the more general

    v = EXPR
    v.sort()
    foo(v)

into

    v = sorted(EXPR)
    foo(v)

Contributed-under: TianoCore Contribution Agreement 1.1
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 49869d9ee4..bf1f853d56 100644
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -305,7 +305,7 @@ def LaunchCommand(Command, WorkingDir):
         if EndOfProcedure is not None:

             EndOfProcedure.set()

         if Proc is None:

-            if type(Command) != type(""):

+            if not isinstance(Command, type("")):

                 Command = " ".join(Command)

             EdkLogger.error("build", COMMAND_FAILURE, "Failed to start command", ExtraData="%s [%s]" % (Command, WorkingDir))

 

@@ -316,7 +316,7 @@ def LaunchCommand(Command, WorkingDir):
 

     # check the return code of the program

     if Proc.returncode != 0:

-        if type(Command) != type(""):

+        if not isinstance(Command, type("")):

             Command = " ".join(Command)

         # print out the Response file and its content when make failure

         RespFile = os.path.join(WorkingDir, 'OUTPUT', 'respfilelist.txt')