BaseTools: Remove the old python "not-equal"

[mirror_edk2.git] / BaseTools / Source / Python / Workspace / DscBuildData.py

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index da1e9ac427c9ba39069e221b00a76a4235b5e971..a80c07bc1e55b56930371d326d0ae4b083a964c2 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -17,7 +17,8 @@
 #  This class is used to retrieve information stored in database and convert them\r
 # into PlatformBuildClassObject form for easier use for AutoGen.\r
 #\r
-from Common.String import *\r
+from __future__ import print_function\r
+from Common.StringUtils import *\r
 from Common.DataType import *\r
 from Common.Misc import *\r
 from types import *\r
@@ -120,7 +121,7 @@ def GetDependencyList(FileStack,SearchPathList):
             try:\r
                 Fd = open(F, 'r')\r
                 FileContent = Fd.read()\r
-            except BaseException, X:\r
+            except BaseException as X:\r
                 EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=F + "\n\t" + str(X))\r
             finally:\r
                 if "Fd" in dir(locals()):\r
@@ -887,11 +888,11 @@ class DscBuildData(PlatformBuildClassObject):
             DatumType = self._DecPcds[PcdCName, TokenSpaceGuid].DatumType\r
             try:\r
                 ValueList[Index] = ValueExpressionEx(ValueList[Index], DatumType, self._GuidDict)(True)\r
-            except BadExpression, Value:\r
+            except BadExpression as Value:\r
                 EdkLogger.error('Parser', FORMAT_INVALID, Value, File=self.MetaFile, Line=LineNo,\r
                                 ExtraData="PCD [%s.%s] Value \"%s\" " % (\r
                                 TokenSpaceGuid, PcdCName, ValueList[Index]))\r
-            except EvaluationException, Excpt:\r
+            except EvaluationException as Excpt:\r
                 if hasattr(Excpt, 'Pcd'):\r
                     if Excpt.Pcd in GlobalData.gPlatformOtherPcds:\r
                         EdkLogger.error('Parser', FORMAT_INVALID, "Cannot use this PCD (%s) in an expression as"\r
@@ -1059,7 +1060,7 @@ class DscBuildData(PlatformBuildClassObject):
                 return PcdValue\r
             try:\r
                 PcdValue = ValueExpressionEx(PcdValue[1:], PcdDatumType, GuidDict)(True)\r
-            except BadExpression, Value:     \r
+            except BadExpression as Value:\r
                 EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s",  %s' %\r
                                 (TokenSpaceGuidCName, TokenCName, PcdValue, Value))\r
         elif PcdValue.startswith("L'") or PcdValue.startswith("'"):\r
@@ -1070,7 +1071,7 @@ class DscBuildData(PlatformBuildClassObject):
                 return PcdValue\r
             try:\r
                 PcdValue = ValueExpressionEx(PcdValue, PcdDatumType, GuidDict)(True)\r
-            except BadExpression, Value:\r
+            except BadExpression as Value:\r
                 EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s",  %s' %\r
                                 (TokenSpaceGuidCName, TokenCName, PcdValue, Value))\r
         elif PcdValue.startswith('L'):\r
@@ -1082,7 +1083,7 @@ class DscBuildData(PlatformBuildClassObject):
                 return PcdValue\r
             try:\r
                 PcdValue = ValueExpressionEx(PcdValue, PcdDatumType, GuidDict)(True)\r
-            except BadExpression, Value:\r
+            except BadExpression as Value:\r
                 EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s",  %s' %\r
                                 (TokenSpaceGuidCName, TokenCName, PcdValue, Value))\r
         else:\r
@@ -1109,7 +1110,7 @@ class DscBuildData(PlatformBuildClassObject):
                     return PcdValue\r
             try:\r
                 PcdValue = ValueExpressionEx(PcdValue, PcdDatumType, GuidDict)(True)\r
-            except BadExpression, Value:\r
+            except BadExpression as Value:\r
                 EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s",  %s' %\r
                                 (TokenSpaceGuidCName, TokenCName, PcdValue, Value))\r
         return PcdValue\r
@@ -1347,7 +1348,7 @@ class DscBuildData(PlatformBuildClassObject):
                         nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)\r
                     stru_pcd.SkuOverrideValues[skuid] = copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid]) if not NoDefault else copy.deepcopy({defaultstorename: stru_pcd.DefaultValues for defaultstorename in DefaultStores} if DefaultStores else {TAB_DEFAULT_STORES_DEFAULT:stru_pcd.DefaultValues})\r
                     if not NoDefault:\r
-                        stru_pcd.ValueChain.add(skuid,'')\r
+                        stru_pcd.ValueChain.add((skuid,''))\r
             if stru_pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]:\r
                 for skuid in SkuIds:\r
                     nextskuid = skuid\r
@@ -1366,14 +1367,14 @@ class DscBuildData(PlatformBuildClassObject):
                     for defaultstoreid in DefaultStores:\r
                         if defaultstoreid not in stru_pcd.SkuOverrideValues[skuid]:\r
                             stru_pcd.SkuOverrideValues[skuid][defaultstoreid] = copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstorename])\r
-                            stru_pcd.ValueChain.add(skuid,defaultstoreid)\r
+                            stru_pcd.ValueChain.add((skuid,defaultstoreid))\r
         S_pcd_set = DscBuildData.OverrideByFdfComm(S_pcd_set)\r
         Str_Pcd_Values = self.GenerateByteArrayValue(S_pcd_set)\r
         if Str_Pcd_Values:\r
             for (skuname,StoreName,PcdGuid,PcdName,PcdValue) in Str_Pcd_Values:\r
                 str_pcd_obj = S_pcd_set.get((PcdName, PcdGuid))\r
                 if str_pcd_obj is None:\r
-                    print PcdName, PcdGuid\r
+                    print(PcdName, PcdGuid)\r
                     raise\r
                 if str_pcd_obj.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII],\r
                                         self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]:\r
@@ -1514,7 +1515,7 @@ class DscBuildData(PlatformBuildClassObject):
                     return len(Value) - 2\r
             return len(Value)\r
 \r
-        return str(max([pcd_size for pcd_size in [get_length(item) for item in sku_values]]))\r
+        return str(max(get_length(item) for item in sku_values))\r
 \r
     @staticmethod\r
     def ExecuteCommand (Command):\r
@@ -1808,7 +1809,7 @@ class DscBuildData(PlatformBuildClassObject):
                         EdkLogger.error('Build', FORMAT_INVALID, "Invalid value format for %s. From %s Line %d " %\r
                                         (".".join((Pcd.TokenSpaceGuidCName, Pcd.TokenCName, FieldName)), FieldList[FieldName][1], FieldList[FieldName][2]))\r
                     except:\r
-                        print "error"\r
+                        print("error")\r
                 try:\r
                     Value, ValueSize = ParseFieldValue (FieldList[FieldName][0])\r
                 except Exception:\r
@@ -2057,11 +2058,11 @@ class DscBuildData(PlatformBuildClassObject):
                         ValueList = Value.split()\r
                         if ValueList:\r
                             for Id, Item in enumerate(ValueList):\r
-                                if Item == '-D' or Item == '/D':\r
+                                if Item in ['-D', '/D', '-U', '/U']:\r
                                     CC_FLAGS += ' ' + Item\r
                                     if Id + 1 < len(ValueList):\r
                                         CC_FLAGS += ' ' + ValueList[Id + 1]\r
-                                elif Item.startswith('/D') or Item.startswith('-D'):\r
+                                elif Item.startswith(('-D', '/D', '-U', '/U')):\r
                                     CC_FLAGS += ' ' + Item\r
         MakeApp += CC_FLAGS\r
 \r
@@ -2078,7 +2079,7 @@ class DscBuildData(PlatformBuildClassObject):
         SearchPathList = []\r
         SearchPathList.append(os.path.normpath(mws.join(GlobalData.gWorkspace, "BaseTools/Source/C/Include")))\r
         SearchPathList.append(os.path.normpath(mws.join(GlobalData.gWorkspace, "BaseTools/Source/C/Common")))\r
-        SearchPathList.extend([str(item) for item in IncSearchList])\r
+        SearchPathList.extend(str(item) for item in IncSearchList)\r
         IncFileList = GetDependencyList(IncludeFileFullPaths,SearchPathList)\r
         for include_file in IncFileList:\r
             MakeApp += "$(OBJECTS) : %s\n" % include_file\r
@@ -2152,7 +2153,7 @@ class DscBuildData(PlatformBuildClassObject):
         if DscBuildData.NeedUpdateOutput(OutputValueFile, PcdValueInitExe ,InputValueFile):\r
             Command = PcdValueInitExe + ' -i %s -o %s' % (InputValueFile, OutputValueFile)\r
             returncode, StdOut, StdErr = DscBuildData.ExecuteCommand (Command)\r
-            if returncode <> 0:\r
+            if returncode != 0:\r
                 EdkLogger.warn('Build', COMMAND_FAILURE, 'Can not collect output from command: %s' % Command)\r
 \r
         File = open (OutputValueFile, 'r')\r
@@ -2324,7 +2325,7 @@ class DscBuildData(PlatformBuildClassObject):
             if PcdType in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]:\r
                 for skuid in PcdObj.SkuInfoList:\r
                     skuobj = PcdObj.SkuInfoList[skuid]\r
-                    mindefaultstorename = DefaultStoreObj.GetMin(set([defaultstorename  for defaultstorename in skuobj.DefaultStoreDict]))\r
+                    mindefaultstorename = DefaultStoreObj.GetMin(set(defaultstorename for defaultstorename in skuobj.DefaultStoreDict))\r
                     for defaultstorename in DefaultStores:\r
                         if defaultstorename not in skuobj.DefaultStoreDict:\r
                             skuobj.DefaultStoreDict[defaultstorename] = copy.deepcopy(skuobj.DefaultStoreDict[mindefaultstorename])\r