BaseTools: Fix old python2 idioms

[mirror_edk2.git] / BaseTools / Source / Python / Common / Misc.py

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 5197818d3f27e80995bc7c9234ad08486974b943..55e3c6f2281b4d3ede9e4687ee014475e9176d66 100644 (file)
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -132,7 +132,7 @@ def _parseForGCC(lines, efifilepath, varnames):
                     if Str:\r
                         m = pcdPatternGcc.match(Str.strip())\r
                         if m is not None:\r
-                            varoffset.append((varname, int(m.groups(0)[0], 16) , int(sections[-1][1], 16), sections[-1][0]))\r
+                            varoffset.append((varname, int(m.groups(0)[0], 16), int(sections[-1][1], 16), sections[-1][0]))\r
 \r
     if not varoffset:\r
         return []\r
@@ -1291,9 +1291,9 @@ def ParseDevPathValue (Value):
     return '{' + out + '}', Size\r
 \r
 def ParseFieldValue (Value):\r
-    if type(Value) == type(0):\r
+    if isinstance(Value, type(0)):\r
         return Value, (Value.bit_length() + 7) / 8\r
-    if type(Value) <> type(''):\r
+    if not isinstance(Value, type('')):\r
         raise BadExpression('Type %s is %s' %(Value, type(Value)))\r
     Value = Value.strip()\r
     if Value.startswith(TAB_UINT8) and Value.endswith(')'):\r
@@ -1469,7 +1469,7 @@ def AnalyzeDscPcd(Setting, PcdType, DataType=''):
 #         Value, Size = ParseFieldValue(Value)\r
         if Size:\r
             try:\r
-                int(Size,16) if Size.upper().startswith("0X") else int(Size)\r
+                int(Size, 16) if Size.upper().startswith("0X") else int(Size)\r
             except:\r
                 IsValid = False\r
                 Size = -1\r
@@ -1490,7 +1490,7 @@ def AnalyzeDscPcd(Setting, PcdType, DataType=''):
 \r
         if Size:\r
             try:\r
-                int(Size,16) if Size.upper().startswith("0X") else int(Size)\r
+                int(Size, 16) if Size.upper().startswith("0X") else int(Size)\r
             except:\r
                 IsValid = False\r
                 Size = -1\r
@@ -1512,7 +1512,7 @@ def AnalyzeDscPcd(Setting, PcdType, DataType=''):
             IsValid = (len(FieldList) <= 3)\r
         if Size:\r
             try:\r
-                int(Size,16) if Size.upper().startswith("0X") else int(Size)\r
+                int(Size, 16) if Size.upper().startswith("0X") else int(Size)\r
             except:\r
                 IsValid = False\r
                 Size = -1\r
@@ -1584,8 +1584,7 @@ def CheckPcdDatum(Type, Value):
             Printset.add(TAB_PRINTCHAR_BS)\r
             Printset.add(TAB_PRINTCHAR_NUL)\r
             if not set(Value).issubset(Printset):\r
-                PrintList = list(Printset)\r
-                PrintList.sort()\r
+                PrintList = sorted(Printset)\r
                 return False, "Invalid PCD string value of type [%s]; must be printable chars %s." % (Type, PrintList)\r
     elif Type == 'BOOLEAN':\r
         if Value not in ['TRUE', 'True', 'true', '0x1', '0x01', '1', 'FALSE', 'False', 'false', '0x0', '0x00', '0']:\r
@@ -1670,7 +1669,7 @@ def ConvertStringToByteArray(Value):
 \r
     Value = eval(Value)         # translate escape character\r
     NewValue = '{'\r
-    for Index in range(0,len(Value)):\r
+    for Index in range(0, len(Value)):\r
         if Unicode:\r
             NewValue = NewValue + str(ord(Value[Index]) % 0x10000) + ','\r
         else:\r
@@ -1747,7 +1746,7 @@ class PathClass(object):
     # @retval True  The two PathClass are the same\r
     #\r
     def __eq__(self, Other):\r
-        if type(Other) == type(self):\r
+        if isinstance(Other, type(self)):\r
             return self.Path == Other.Path\r
         else:\r
             return self.Path == str(Other)\r
@@ -1760,7 +1759,7 @@ class PathClass(object):
     # @retval -1    The first PathClass is less than the second PathClass\r
     # @retval 1     The first PathClass is Bigger than the second PathClass\r
     def __cmp__(self, Other):\r
-        if type(Other) == type(self):\r
+        if isinstance(Other, type(self)):\r
             OtherKey = Other.Path\r
         else:\r
             OtherKey = str(Other)\r
@@ -1914,28 +1913,28 @@ class PeImageClass():
         return Value\r
 \r
 class DefaultStore():\r
-    def __init__(self,DefaultStores ):\r
+    def __init__(self, DefaultStores ):\r
 \r
         self.DefaultStores = DefaultStores\r
-    def DefaultStoreID(self,DefaultStoreName):\r
-        for key,value in self.DefaultStores.items():\r
+    def DefaultStoreID(self, DefaultStoreName):\r
+        for key, value in self.DefaultStores.items():\r
             if value == DefaultStoreName:\r
                 return key\r
         return None\r
     def GetDefaultDefault(self):\r
         if not self.DefaultStores or "0" in self.DefaultStores:\r
-            return "0",TAB_DEFAULT_STORES_DEFAULT\r
+            return "0", TAB_DEFAULT_STORES_DEFAULT\r
         else:\r
             minvalue = min(int(value_str) for value_str in self.DefaultStores)\r
             return (str(minvalue), self.DefaultStores[str(minvalue)])\r
-    def GetMin(self,DefaultSIdList):\r
+    def GetMin(self, DefaultSIdList):\r
         if not DefaultSIdList:\r
             return TAB_DEFAULT_STORES_DEFAULT\r
         storeidset = {storeid for storeid, storename in self.DefaultStores.values() if storename in DefaultSIdList}\r
         if not storeidset:\r
             return ""\r
         minid = min(storeidset )\r
-        for sid,name in self.DefaultStores.values():\r
+        for sid, name in self.DefaultStores.values():\r
             if sid == minid:\r
                 return name\r
 class SkuClass():\r
@@ -1950,7 +1949,7 @@ class SkuClass():
 \r
         for SkuName in SkuIds:\r
             SkuId = SkuIds[SkuName][0]\r
-            skuid_num = int(SkuId,16) if SkuId.upper().startswith("0X") else int(SkuId)\r
+            skuid_num = int(SkuId, 16) if SkuId.upper().startswith("0X") else int(SkuId)\r
             if skuid_num > 0xFFFFFFFFFFFFFFFF:\r
                 EdkLogger.error("build", PARAMETER_INVALID,\r
                             ExtraData = "SKU-ID [%s] value %s exceeds the max value of UINT64"\r
@@ -2003,14 +2002,14 @@ class SkuClass():
             self.__SkuInherit = {}\r
             for item in self.SkuData.values():\r
                 self.__SkuInherit[item[1]]=item[2] if item[2] else "DEFAULT"\r
-        return self.__SkuInherit.get(skuname,"DEFAULT")\r
+        return self.__SkuInherit.get(skuname, "DEFAULT")\r
 \r
-    def GetSkuChain(self,sku):\r
+    def GetSkuChain(self, sku):\r
         if sku == "DEFAULT":\r
             return ["DEFAULT"]\r
         skulist = [sku]\r
         nextsku = sku\r
-        while 1:\r
+        while True:\r
             nextsku = self.GetNextSkuId(nextsku)\r
             skulist.append(nextsku)\r
             if nextsku == "DEFAULT":\r