BaseTools: fix None comparisons

when comparing a list/string against None and empty, just compare the object.
when comparing against None, dont use !=, ==, <>

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

5 files changed, 9 insertions, 10 deletions

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index a4e36d1a2f..69c1ef4eba 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1665,7 +1665,7 @@ class PlatformAutoGen(AutoGen):
                                             DscPcdEntry.TokenValue = DecPcdEntry.TokenValue

                                             DscPcdEntry.TokenSpaceGuidValue = eachDec.Guids[DecPcdEntry.TokenSpaceGuidCName]

                                             # Only fix the value while no value provided in DSC file.

-                                            if (Sku.DefaultValue == "" or Sku.DefaultValue==None):

+                                            if not Sku.DefaultValue:

                                                 DscPcdEntry.SkuInfoList[DscPcdEntry.SkuInfoList.keys()[0]].DefaultValue = DecPcdEntry.DefaultValue

                                                                                                                     

                                 if DscPcdEntry not in self._DynamicPcdList:

diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
index c11bbc5716..6706629722 100644
--- a/BaseTools/Source/Python/AutoGen/GenC.py
+++ b/BaseTools/Source/Python/AutoGen/GenC.py
@@ -1540,7 +1540,7 @@ def CreateModuleEntryPointCode(Info, AutoGenC, AutoGenH):
     }

 

     if Info.ModuleType in ['PEI_CORE', 'DXE_CORE', 'SMM_CORE', 'MM_CORE_STANDALONE']:

-        if Info.SourceFileList <> None and Info.SourceFileList <> []:

+        if Info.SourceFileList:

           if NumEntryPoints != 1:

               EdkLogger.error(

                   "build",

diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index 345ad3bdcc..aae644bef9 100644
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -337,11 +337,10 @@ class FV (FvClassObject):
         #

         # Generate FV extension header file

         #

-        if self.FvNameGuid is None or self.FvNameGuid == '':

+        if not self.FvNameGuid:

             if len(self.FvExtEntryType) > 0 or self.UsedSizeEnable:

                 GenFdsGlobalVariable.ErrorLogger("FV Extension Header Entries declared for %s with no FvNameGuid declaration." % (self.UiFvName))

-        

-        if self.FvNameGuid <> None and self.FvNameGuid <> '':

+        else:

             TotalSize = 16 + 4

             Buffer = ''

             if self.UsedSizeEnable:

diff --git a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
index 95a636966c..9711de8f5c 100644
--- a/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
+++ b/BaseTools/Source/Python/Rsa2048Sha256Sign/Rsa2048Sha256GenerateKeys.py
@@ -9,7 +9,7 @@
 # on STDOUT.

 # This tool has been tested with OpenSSL 1.0.1e 11 Feb 2013

 #

-# Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -89,7 +89,7 @@ if __name__ == '__main__':
   #

   # Check for output file argument

   #

-  if args.OutputFile <> None:

+  if args.OutputFile is not None:

     for Item in args.OutputFile:

       #

       # Save PEM filename and close output file

@@ -109,7 +109,7 @@ if __name__ == '__main__':
   #

   # Check for input file argument

   #

-  if args.InputFile <> None:

+  if args.InputFile is not None:

     for Item in args.InputFile:

       #

       # Save PEM filename and close input file

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index fcd3132860..7ffb825efa 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -2292,7 +2292,7 @@ class DscBuildData(PlatformBuildClassObject):
             pcdDecObject = self._DecPcds[pcd.TokenCName, pcd.TokenSpaceGuidCName]

             # Only fix the value while no value provided in DSC file.

             for sku in pcd.SkuInfoList.values():

-                if (sku.DefaultValue == "" or sku.DefaultValue==None):

+                if not sku.DefaultValue:

                     sku.DefaultValue = pcdDecObject.DefaultValue

             if 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' not in pcd.SkuInfoList.keys():

                 valuefromDec = pcdDecObject.DefaultValue

@@ -2624,7 +2624,7 @@ class DscBuildData(PlatformBuildClassObject):
             pcd.DatumType = pcdDecObject.DatumType

             # Only fix the value while no value provided in DSC file.

             for sku in pcd.SkuInfoList.values():

-                if (sku.DefaultValue == "" or sku.DefaultValue==None):

+                if not sku.DefaultValue:

                     sku.DefaultValue = pcdDecObject.DefaultValue

             if 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' not in pcd.SkuInfoList.keys():

                 valuefromDec = pcdDecObject.DefaultValue