BaseTools: Fix old python2 idioms

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

diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index 209315d901b2cc192cd86ea4889b7e11ca207419..c188b47534f889f75bf8fa34b6cbb99bcc377efc 100644 (file)
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -70,23 +70,23 @@ class PcdClassObject(object):
         if IsDsc:\r
             self.DscDefaultValue = Value\r
         self.PcdValueFromComm = ""\r
-        self.DefinitionPosition = ("","")\r
+        self.DefinitionPosition = ("", "")\r
 \r
     ## Get the maximum number of bytes\r
     def GetPcdMaxSize(self):\r
         if self.DatumType in TAB_PCD_NUMERIC_TYPES:\r
             return MAX_SIZE_TYPE[self.DatumType]\r
 \r
-        MaxSize = int(self.MaxDatumSize,10) if self.MaxDatumSize else 0\r
+        MaxSize = int(self.MaxDatumSize, 10) if self.MaxDatumSize else 0\r
         if self.PcdValueFromComm:\r
             if self.PcdValueFromComm.startswith("{") and self.PcdValueFromComm.endswith("}"):\r
-                return max([len(self.PcdValueFromComm.split(",")),MaxSize])\r
+                return max([len(self.PcdValueFromComm.split(",")), MaxSize])\r
             elif self.PcdValueFromComm.startswith("\"") or self.PcdValueFromComm.startswith("\'"):\r
-                return max([len(self.PcdValueFromComm)-2+1,MaxSize])\r
+                return max([len(self.PcdValueFromComm)-2+1, MaxSize])\r
             elif self.PcdValueFromComm.startswith("L\""):\r
-                return max([2*(len(self.PcdValueFromComm)-3+1),MaxSize])\r
+                return max([2*(len(self.PcdValueFromComm)-3+1), MaxSize])\r
             else:\r
-                return max([len(self.PcdValueFromComm),MaxSize])\r
+                return max([len(self.PcdValueFromComm), MaxSize])\r
         return MaxSize\r
 \r
     ## Get the number of bytes\r
@@ -178,7 +178,7 @@ class StructurePcd(PcdClassObject):
         self.DefaultValues[FieldName] = [Value.strip(), FileName, LineNo]\r
         return self.DefaultValues[FieldName]\r
 \r
-    def SetDecDefaultValue(self,DefaultValue):\r
+    def SetDecDefaultValue(self, DefaultValue):\r
         self.DefaultValueFromDec = DefaultValue\r
     def AddOverrideValue (self, FieldName, Value, SkuName, DefaultStoreName, FileName="", LineNo=0):\r
         if SkuName not in self.SkuOverrideValues:\r
@@ -217,7 +217,7 @@ class StructurePcd(PcdClassObject):
         self.DscRawValue = PcdObject.DscRawValue if PcdObject.DscRawValue else self.DscRawValue\r
         self.PcdValueFromComm = PcdObject.PcdValueFromComm if PcdObject.PcdValueFromComm else self.PcdValueFromComm\r
         self.DefinitionPosition = PcdObject.DefinitionPosition if PcdObject.DefinitionPosition else self.DefinitionPosition\r
-        if type(PcdObject) is StructurePcd:\r
+        if isinstance(PcdObject, StructurePcd):\r
             self.StructuredPcdIncludeFile = PcdObject.StructuredPcdIncludeFile if PcdObject.StructuredPcdIncludeFile else self.StructuredPcdIncludeFile\r
             self.PackageDecs = PcdObject.PackageDecs if PcdObject.PackageDecs else self.PackageDecs\r
             self.DefaultValues = PcdObject.DefaultValues if PcdObject.DefaultValues else self.DefaultValues\r