BaseTools: Adjust the spaces around commas and colons

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

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>

6 files changed, 154 insertions, 154 deletions

diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index 209315d901..2569235fb8 100644
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -70,23 +70,23 @@ class PcdClassObject(object):
         if IsDsc:

             self.DscDefaultValue = Value

         self.PcdValueFromComm = ""

-        self.DefinitionPosition = ("","")

+        self.DefinitionPosition = ("", "")

 

     ## Get the maximum number of bytes

     def GetPcdMaxSize(self):

         if self.DatumType in TAB_PCD_NUMERIC_TYPES:

             return MAX_SIZE_TYPE[self.DatumType]

 

-        MaxSize = int(self.MaxDatumSize,10) if self.MaxDatumSize else 0

+        MaxSize = int(self.MaxDatumSize, 10) if self.MaxDatumSize else 0

         if self.PcdValueFromComm:

             if self.PcdValueFromComm.startswith("{") and self.PcdValueFromComm.endswith("}"):

-                return max([len(self.PcdValueFromComm.split(",")),MaxSize])

+                return max([len(self.PcdValueFromComm.split(",")), MaxSize])

             elif self.PcdValueFromComm.startswith("\"") or self.PcdValueFromComm.startswith("\'"):

-                return max([len(self.PcdValueFromComm)-2+1,MaxSize])

+                return max([len(self.PcdValueFromComm)-2+1, MaxSize])

             elif self.PcdValueFromComm.startswith("L\""):

-                return max([2*(len(self.PcdValueFromComm)-3+1),MaxSize])

+                return max([2*(len(self.PcdValueFromComm)-3+1), MaxSize])

             else:

-                return max([len(self.PcdValueFromComm),MaxSize])

+                return max([len(self.PcdValueFromComm), MaxSize])

         return MaxSize

 

     ## Get the number of bytes

@@ -178,7 +178,7 @@ class StructurePcd(PcdClassObject):
         self.DefaultValues[FieldName] = [Value.strip(), FileName, LineNo]

         return self.DefaultValues[FieldName]

 

-    def SetDecDefaultValue(self,DefaultValue):

+    def SetDecDefaultValue(self, DefaultValue):

         self.DefaultValueFromDec = DefaultValue

     def AddOverrideValue (self, FieldName, Value, SkuName, DefaultStoreName, FileName="", LineNo=0):

         if SkuName not in self.SkuOverrideValues:

diff --git a/BaseTools/Source/Python/Workspace/DecBuildData.py b/BaseTools/Source/Python/Workspace/DecBuildData.py
index 99257d0814..7eeca95245 100644
--- a/BaseTools/Source/Python/Workspace/DecBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DecBuildData.py
@@ -369,16 +369,16 @@ class DecBuildData(PackageBuildClassObject):
 

     def ProcessStructurePcd(self, StructurePcdRawDataSet):

         s_pcd_set = OrderedDict()

-        for s_pcd,LineNo in StructurePcdRawDataSet:

+        for s_pcd, LineNo in StructurePcdRawDataSet:

             if s_pcd.TokenSpaceGuidCName not in s_pcd_set:

                 s_pcd_set[s_pcd.TokenSpaceGuidCName] = []

-            s_pcd_set[s_pcd.TokenSpaceGuidCName].append((s_pcd,LineNo))

+            s_pcd_set[s_pcd.TokenSpaceGuidCName].append((s_pcd, LineNo))

 

         str_pcd_set = []

         for pcdname in s_pcd_set:

             dep_pkgs = []

             struct_pcd = StructurePcd()

-            for item,LineNo in s_pcd_set[pcdname]:

+            for item, LineNo in s_pcd_set[pcdname]:

                 if "<HeaderFiles>" in item.TokenCName:

                     struct_pcd.StructuredPcdIncludeFile.append(item.DefaultValue)

                 elif "<Packages>" in item.TokenCName:

@@ -391,7 +391,7 @@ class DecBuildData(PackageBuildClassObject):
                     struct_pcd.PkgPath = self.MetaFile.File

                     struct_pcd.SetDecDefaultValue(item.DefaultValue)

                 else:

-                    struct_pcd.AddDefaultValue(item.TokenCName, item.DefaultValue,self.MetaFile.File,LineNo)

+                    struct_pcd.AddDefaultValue(item.TokenCName, item.DefaultValue, self.MetaFile.File, LineNo)

 

             struct_pcd.PackageDecs = dep_pkgs

             str_pcd_set.append(struct_pcd)

@@ -412,7 +412,7 @@ class DecBuildData(PackageBuildClassObject):
         StrPcdSet = []

         RecordList = self._RawData[Type, self._Arch]

         for TokenSpaceGuid, PcdCName, Setting, Arch, PrivateFlag, Dummy1, Dummy2 in RecordList:

-            PcdDict[Arch, PcdCName, TokenSpaceGuid] = (Setting,Dummy2)

+            PcdDict[Arch, PcdCName, TokenSpaceGuid] = (Setting, Dummy2)

             if not (PcdCName, TokenSpaceGuid) in PcdSet:

                 PcdSet.append((PcdCName, TokenSpaceGuid))

 

@@ -421,7 +421,7 @@ class DecBuildData(PackageBuildClassObject):
             # limit the ARCH to self._Arch, if no self._Arch found, tdict

             # will automatically turn to 'common' ARCH and try again

             #

-            Setting,LineNo = PcdDict[self._Arch, PcdCName, TokenSpaceGuid]

+            Setting, LineNo = PcdDict[self._Arch, PcdCName, TokenSpaceGuid]

             if Setting is None:

                 continue

 

@@ -442,9 +442,9 @@ class DecBuildData(PackageBuildClassObject):
                                         list(validlists),

                                         list(expressions)

                                         )

-            PcdObj.DefinitionPosition = (self.MetaFile.File,LineNo)

+            PcdObj.DefinitionPosition = (self.MetaFile.File, LineNo)

             if "." in TokenSpaceGuid:

-                StrPcdSet.append((PcdObj,LineNo))

+                StrPcdSet.append((PcdObj, LineNo))

             else:

                 Pcds[PcdCName, TokenSpaceGuid, self._PCD_TYPE_STRING_[Type]] = PcdObj

 

@@ -455,10 +455,10 @@ class DecBuildData(PackageBuildClassObject):
         for pcd in Pcds.values():

             if pcd.DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64, TAB_VOID, "BOOLEAN"]:

                 if StructPattern.match(pcd.DatumType) is None:

-                    EdkLogger.error('build', FORMAT_INVALID, "DatumType only support BOOLEAN, UINT8, UINT16, UINT32, UINT64, VOID* or a valid struct name.", pcd.DefinitionPosition[0],pcd.DefinitionPosition[1])

+                    EdkLogger.error('build', FORMAT_INVALID, "DatumType only support BOOLEAN, UINT8, UINT16, UINT32, UINT64, VOID* or a valid struct name.", pcd.DefinitionPosition[0], pcd.DefinitionPosition[1])

         for struct_pcd in Pcds.values():

-            if isinstance(struct_pcd,StructurePcd) and not struct_pcd.StructuredPcdIncludeFile:

-                EdkLogger.error("build", PCD_STRUCTURE_PCD_ERROR, "The structure Pcd %s.%s header file is not found in %s line %s \n" % (struct_pcd.TokenSpaceGuidCName, struct_pcd.TokenCName,struct_pcd.DefinitionPosition[0],struct_pcd.DefinitionPosition[1] ))

+            if isinstance(struct_pcd, StructurePcd) and not struct_pcd.StructuredPcdIncludeFile:

+                EdkLogger.error("build", PCD_STRUCTURE_PCD_ERROR, "The structure Pcd %s.%s header file is not found in %s line %s \n" % (struct_pcd.TokenSpaceGuidCName, struct_pcd.TokenCName, struct_pcd.DefinitionPosition[0], struct_pcd.DefinitionPosition[1] ))

 

         return Pcds

     @property

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index a80c07bc1e..9e7b8a18c2 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -40,7 +40,7 @@ import Common.GlobalData as GlobalData
 import subprocess

 from Common.Misc import SaveFileOnChange

 from Workspace.BuildClassObject import PlatformBuildClassObject, StructurePcd, PcdClassObject, ModuleBuildClassObject

-from collections import OrderedDict,defaultdict

+from collections import OrderedDict, defaultdict

 

 PcdValueInitName = 'PcdValueInit'

 

@@ -108,7 +108,7 @@ from AutoGen.GenMake import gIncludePattern
 #

 #   @retval     list            The list of files the given source file depends on

 #

-def GetDependencyList(FileStack,SearchPathList):

+def GetDependencyList(FileStack, SearchPathList):

     DepDb = dict()

     DependencySet = set(FileStack)

     while len(FileStack) > 0:

@@ -224,7 +224,7 @@ class DscBuildData(PlatformBuildClassObject):
     @property

     def OutputPath(self):

         if os.getenv("WORKSPACE"):

-            return os.path.join(os.getenv("WORKSPACE"), self.OutputDirectory, self._Target + "_" + self._Toolchain,PcdValueInitName)

+            return os.path.join(os.getenv("WORKSPACE"), self.OutputDirectory, self._Target + "_" + self._Toolchain, PcdValueInitName)

         else:

             return os.path.dirname(self.DscFile)

 

@@ -657,7 +657,7 @@ class DscBuildData(PlatformBuildClassObject):
 

     @staticmethod

     def ToInt(intstr):

-        return int(intstr,16) if intstr.upper().startswith("0X") else int(intstr)

+        return int(intstr, 16) if intstr.upper().startswith("0X") else int(intstr)

 

     def _GetDefaultStores(self):

         if self.DefaultStores is None:

@@ -676,9 +676,9 @@ class DscBuildData(PlatformBuildClassObject):
                 if not IsValidWord(Record[1]):

                     EdkLogger.error('build', FORMAT_INVALID, "The format of the DefaultStores ID name is invalid. The correct format is '(a-zA-Z0-9_)(a-zA-Z0-9_-.)*'",

                                     File=self.MetaFile, Line=Record[-1])

-                self.DefaultStores[Record[1].upper()] = (DscBuildData.ToInt(Record[0]),Record[1].upper())

+                self.DefaultStores[Record[1].upper()] = (DscBuildData.ToInt(Record[0]), Record[1].upper())

             if TAB_DEFAULT_STORES_DEFAULT not in self.DefaultStores:

-                self.DefaultStores[TAB_DEFAULT_STORES_DEFAULT] = (0,TAB_DEFAULT_STORES_DEFAULT)

+                self.DefaultStores[TAB_DEFAULT_STORES_DEFAULT] = (0, TAB_DEFAULT_STORES_DEFAULT)

             GlobalData.gDefaultStores = sorted(self.DefaultStores.keys())

         return self.DefaultStores

 

@@ -736,7 +736,7 @@ class DscBuildData(PlatformBuildClassObject):
             for Type in [MODEL_PCD_FIXED_AT_BUILD, MODEL_PCD_PATCHABLE_IN_MODULE, \

                          MODEL_PCD_FEATURE_FLAG, MODEL_PCD_DYNAMIC, MODEL_PCD_DYNAMIC_EX]:

                 RecordList = self._RawData[Type, self._Arch, None, ModuleId]

-                for TokenSpaceGuid, PcdCName, Setting, Dummy1, Dummy2, Dummy3, Dummy4,Dummy5 in RecordList:

+                for TokenSpaceGuid, PcdCName, Setting, Dummy1, Dummy2, Dummy3, Dummy4, Dummy5 in RecordList:

                     TokenList = GetSplitValueList(Setting)

                     DefaultValue = TokenList[0]

                     # the format is PcdName| Value | VOID* | MaxDatumSize

@@ -761,7 +761,7 @@ class DscBuildData(PlatformBuildClassObject):
 

             # get module private build options

             RecordList = self._RawData[MODEL_META_DATA_BUILD_OPTION, self._Arch, None, ModuleId]

-            for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Dummy3, Dummy4,Dummy5 in RecordList:

+            for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Dummy3, Dummy4, Dummy5 in RecordList:

                 if (ToolChainFamily, ToolChain) not in Module.BuildOptions:

                     Module.BuildOptions[ToolChainFamily, ToolChain] = Option

                 else:

@@ -801,7 +801,7 @@ class DscBuildData(PlatformBuildClassObject):
             RecordList = self._RawData[MODEL_EFI_LIBRARY_CLASS, self._Arch, None, -1]

             Macros = self._Macros

             for Record in RecordList:

-                LibraryClass, LibraryInstance, Dummy, Arch, ModuleType, Dummy,Dummy, LineNo = Record

+                LibraryClass, LibraryInstance, Dummy, Arch, ModuleType, Dummy, Dummy, LineNo = Record

                 if LibraryClass == '' or LibraryClass == 'NULL':

                     self._NullLibraryNumber += 1

                     LibraryClass = 'NULL%d' % self._NullLibraryNumber

@@ -868,7 +868,7 @@ class DscBuildData(PlatformBuildClassObject):
                 ModuleData = self._Bdb[ModuleFile, self._Arch, self._Target, self._Toolchain]

                 PkgSet.update(ModuleData.Packages)

 

-            self._DecPcds, self._GuidDict = GetDeclaredPcd(self, self._Bdb, self._Arch, self._Target, self._Toolchain,PkgSet)

+            self._DecPcds, self._GuidDict = GetDeclaredPcd(self, self._Bdb, self._Arch, self._Target, self._Toolchain, PkgSet)

             self._GuidDict.update(GlobalData.gPlatformPcds)

 

         if (PcdCName, TokenSpaceGuid) not in self._DecPcds:

@@ -913,14 +913,14 @@ class DscBuildData(PlatformBuildClassObject):
                                 ExtraData="%s.%s" % (TokenSpaceGuid, PcdCName))

             if PcdType in (MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_EX_DEFAULT):

                 if self._DecPcds[PcdCName, TokenSpaceGuid].DatumType.strip() != ValueList[1].strip():

-                    EdkLogger.error('build', FORMAT_INVALID, "Pcd datumtype used in DSC file is not the same as its declaration in DEC file." , File=self.MetaFile, Line=LineNo,

+                    EdkLogger.error('build', FORMAT_INVALID, "Pcd datumtype used in DSC file is not the same as its declaration in DEC file.", File=self.MetaFile, Line=LineNo,

                                 ExtraData="%s.%s|%s" % (TokenSpaceGuid, PcdCName, Setting))

         if (TokenSpaceGuid + '.' + PcdCName) in GlobalData.gPlatformPcds:

             if GlobalData.gPlatformPcds[TokenSpaceGuid + '.' + PcdCName] != ValueList[Index]:

                 GlobalData.gPlatformPcds[TokenSpaceGuid + '.' + PcdCName] = ValueList[Index]

         return ValueList

 

-    def _FilterPcdBySkuUsage(self,Pcds):

+    def _FilterPcdBySkuUsage(self, Pcds):

         available_sku = self.SkuIdMgr.AvailableSkuIdSet

         sku_usage = self.SkuIdMgr.SkuUsageType

         if sku_usage == SkuClass.SINGLE:

@@ -936,7 +936,7 @@ class DscBuildData(PlatformBuildClassObject):
                 if type(pcd) is StructurePcd and pcd.SkuOverrideValues:

                     Pcds[pcdname].SkuOverrideValues = {skuid:pcd.SkuOverrideValues[skuid] for skuid in pcd.SkuOverrideValues if skuid in available_sku}

         return Pcds

-    def CompleteHiiPcdsDefaultStores(self,Pcds):

+    def CompleteHiiPcdsDefaultStores(self, Pcds):

         HiiPcd = [Pcds[pcd] for pcd in Pcds if Pcds[pcd].Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]]

         DefaultStoreMgr = DefaultStore(self.DefaultStores)

         for pcd in HiiPcd:

@@ -958,7 +958,7 @@ class DscBuildData(PlatformBuildClassObject):
             else:

                 pcd.PcdValueFromComm = pcd.SkuInfoList.get(TAB_DEFAULT).DefaultValue

         for pcd in self._Pcds:

-            if isinstance(self._Pcds[pcd],StructurePcd) and (self._Pcds[pcd].PcdValueFromComm or self._Pcds[pcd].PcdFieldValueFromComm):

+            if isinstance(self._Pcds[pcd], StructurePcd) and (self._Pcds[pcd].PcdValueFromComm or self._Pcds[pcd].PcdFieldValueFromComm):

                 UpdateCommandLineValue(self._Pcds[pcd])

 

     def __ParsePcdFromCommandLine(self):

@@ -970,10 +970,10 @@ class DscBuildData(PlatformBuildClassObject):
                 if not pcdvalue:

                     EdkLogger.error('build', AUTOGEN_ERROR, "No Value specified for the PCD %s." % (pcdname))

                 if '.' in pcdname:

-                    (Name1, Name2) = pcdname.split('.',1)

+                    (Name1, Name2) = pcdname.split('.', 1)

                     if "." in Name2:

-                        (Name3, FieldName) = Name2.split(".",1)

-                        if ((Name3,Name1)) in self.DecPcds:

+                        (Name3, FieldName) = Name2.split(".", 1)

+                        if ((Name3, Name1)) in self.DecPcds:

                             HasTokenSpace = True

                             TokenCName = Name3

                             TokenSpaceGuidCName = Name1

@@ -983,7 +983,7 @@ class DscBuildData(PlatformBuildClassObject):
                             TokenSpaceGuidCName = ''

                             HasTokenSpace = False

                     else:

-                        if ((Name2,Name1)) in self.DecPcds:

+                        if ((Name2, Name1)) in self.DecPcds:

                             HasTokenSpace = True

                             TokenCName = Name2

                             TokenSpaceGuidCName = Name1

@@ -1037,7 +1037,7 @@ class DscBuildData(PlatformBuildClassObject):
                     IsValid, Cause = CheckPcdDatum(PcdDatumType, pcdvalue)

                     if not IsValid:

                         EdkLogger.error("build", FORMAT_INVALID, Cause, ExtraData="%s.%s" % (TokenSpaceGuidCName, TokenCName))

-                GlobalData.BuildOptionPcd[i] = (TokenSpaceGuidCName, TokenCName, FieldName, pcdvalue,("build command options",1))

+                GlobalData.BuildOptionPcd[i] = (TokenSpaceGuidCName, TokenCName, FieldName, pcdvalue, ("build command options", 1))

 

                 for BuildData in self._Bdb._CACHE_.values():

                     if BuildData.MetaFile.Ext == '.dec' or BuildData.MetaFile.Ext == '.dsc':

@@ -1148,7 +1148,7 @@ class DscBuildData(PlatformBuildClassObject):
             #

             for CodeBase in (EDKII_NAME, EDK_NAME):

                 RecordList = self._RawData[MODEL_META_DATA_BUILD_OPTION, self._Arch, CodeBase]

-                for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Dummy3, Dummy4,Dummy5 in RecordList:

+                for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Dummy3, Dummy4, Dummy5 in RecordList:

                     if Dummy3.upper() != TAB_COMMON:

                         continue

                     CurKey = (ToolChainFamily, ToolChain, CodeBase)

@@ -1171,7 +1171,7 @@ class DscBuildData(PlatformBuildClassObject):
             DriverType = '%s.%s' % (Edk, ModuleType)

             CommonDriverType = '%s.%s' % (TAB_COMMON, ModuleType)

             RecordList = self._RawData[MODEL_META_DATA_BUILD_OPTION, self._Arch]

-            for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Dummy3, Dummy4,Dummy5 in RecordList:

+            for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Dummy3, Dummy4, Dummy5 in RecordList:

                 Type = Dummy2 + '.' + Dummy3

                 if Type.upper() == DriverType.upper() or Type.upper() == CommonDriverType.upper():

                     Key = (ToolChainFamily, ToolChain, Edk)

@@ -1186,7 +1186,7 @@ class DscBuildData(PlatformBuildClassObject):
     def GetStructurePcdInfo(PcdSet):

         structure_pcd_data = defaultdict(list)

         for item in PcdSet:

-            structure_pcd_data[(item[0],item[1])].append(item)

+            structure_pcd_data[(item[0], item[1])].append(item)

 

         return structure_pcd_data

 

@@ -1194,25 +1194,25 @@ class DscBuildData(PlatformBuildClassObject):
     def OverrideByFdfComm(StruPcds):

         StructurePcdInCom = OrderedDict()

         for item in GlobalData.BuildOptionPcd:

-            if len(item) == 5 and (item[1],item[0]) in StruPcds:

-                StructurePcdInCom[(item[0],item[1],item[2] )] = (item[3],item[4])

-        GlobalPcds = {(item[0],item[1]) for item in StructurePcdInCom}

+            if len(item) == 5 and (item[1], item[0]) in StruPcds:

+                StructurePcdInCom[(item[0], item[1], item[2] )] = (item[3], item[4])

+        GlobalPcds = {(item[0], item[1]) for item in StructurePcdInCom}

         for Pcd in StruPcds.values():

-            if (Pcd.TokenSpaceGuidCName,Pcd.TokenCName) not in GlobalPcds:

+            if (Pcd.TokenSpaceGuidCName, Pcd.TokenCName) not in GlobalPcds:

                 continue

             FieldValues = OrderedDict()

             for item in StructurePcdInCom:

-                if (Pcd.TokenSpaceGuidCName,Pcd.TokenCName) == (item[0],item[1]) and item[2]:

+                if (Pcd.TokenSpaceGuidCName, Pcd.TokenCName) == (item[0], item[1]) and item[2]:

                     FieldValues[item[2]] = StructurePcdInCom[item]

             for field in FieldValues:

                 if field not in Pcd.PcdFieldValueFromComm:

-                    Pcd.PcdFieldValueFromComm[field] = ["","",""]

+                    Pcd.PcdFieldValueFromComm[field] = ["", "", ""]

                 Pcd.PcdFieldValueFromComm[field][0] = FieldValues[field][0]

                 Pcd.PcdFieldValueFromComm[field][1] = FieldValues[field][1][0]

                 Pcd.PcdFieldValueFromComm[field][2] = FieldValues[field][1][1]

         return StruPcds

 

-    def OverrideByFdfCommOverAll(self,AllPcds):

+    def OverrideByFdfCommOverAll(self, AllPcds):

         def CheckStructureInComm(commpcds):

             if not commpcds:

                 return False

@@ -1221,43 +1221,43 @@ class DscBuildData(PlatformBuildClassObject):
             return False

 

         if CheckStructureInComm(GlobalData.BuildOptionPcd):

-            StructurePcdInCom = {(item[0],item[1],item[2] ):(item[3],item[4]) for item in GlobalData.BuildOptionPcd } if GlobalData.BuildOptionPcd else {}

-            NoFiledValues = {(item[0],item[1]):StructurePcdInCom[item] for item in StructurePcdInCom if not item[2]}

+            StructurePcdInCom = {(item[0], item[1], item[2] ):(item[3], item[4]) for item in GlobalData.BuildOptionPcd } if GlobalData.BuildOptionPcd else {}

+            NoFiledValues = {(item[0], item[1]):StructurePcdInCom[item] for item in StructurePcdInCom if not item[2]}

         else:

-            NoFiledValues = {(item[0],item[1]):[item[2]] for item in GlobalData.BuildOptionPcd}

-        for Guid,Name in NoFiledValues:

-            if (Name,Guid) in AllPcds:

-                Pcd = AllPcds.get((Name,Guid))

-                if isinstance(self._DecPcds.get((Pcd.TokenCName,Pcd.TokenSpaceGuidCName), None),StructurePcd):

-                    self._DecPcds.get((Pcd.TokenCName,Pcd.TokenSpaceGuidCName)).PcdValueFromComm = NoFiledValues[(Pcd.TokenSpaceGuidCName,Pcd.TokenCName)][0]

+            NoFiledValues = {(item[0], item[1]):[item[2]] for item in GlobalData.BuildOptionPcd}

+        for Guid, Name in NoFiledValues:

+            if (Name, Guid) in AllPcds:

+                Pcd = AllPcds.get((Name, Guid))

+                if isinstance(self._DecPcds.get((Pcd.TokenCName, Pcd.TokenSpaceGuidCName), None), StructurePcd):

+                    self._DecPcds.get((Pcd.TokenCName, Pcd.TokenSpaceGuidCName)).PcdValueFromComm = NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]

                 else:

-                    Pcd.PcdValueFromComm = NoFiledValues[(Pcd.TokenSpaceGuidCName,Pcd.TokenCName)][0]

-                    Pcd.DefaultValue = NoFiledValues[(Pcd.TokenSpaceGuidCName,Pcd.TokenCName)][0]

+                    Pcd.PcdValueFromComm = NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]

+                    Pcd.DefaultValue = NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]

                     for sku in Pcd.SkuInfoList:

                         SkuInfo = Pcd.SkuInfoList[sku]

                         if SkuInfo.DefaultValue:

-                            SkuInfo.DefaultValue = NoFiledValues[(Pcd.TokenSpaceGuidCName,Pcd.TokenCName)][0]

+                            SkuInfo.DefaultValue = NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]

                         else:

-                            SkuInfo.HiiDefaultValue = NoFiledValues[(Pcd.TokenSpaceGuidCName,Pcd.TokenCName)][0]

+                            SkuInfo.HiiDefaultValue = NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]

                             for defaultstore in SkuInfo.DefaultStoreDict:

-                                SkuInfo.DefaultStoreDict[defaultstore] = NoFiledValues[(Pcd.TokenSpaceGuidCName,Pcd.TokenCName)][0]

+                                SkuInfo.DefaultStoreDict[defaultstore] = NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]

                     if Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII]]:

                         if Pcd.DatumType == TAB_VOID:

                             if not Pcd.MaxDatumSize:

                                 Pcd.MaxDatumSize = '0'

-                            CurrentSize = int(Pcd.MaxDatumSize,16) if Pcd.MaxDatumSize.upper().startswith("0X") else int(Pcd.MaxDatumSize)

+                            CurrentSize = int(Pcd.MaxDatumSize, 16) if Pcd.MaxDatumSize.upper().startswith("0X") else int(Pcd.MaxDatumSize)

                             OptionSize = len((StringToArray(Pcd.PcdValueFromComm)).split(","))

                             MaxSize = max(CurrentSize, OptionSize)

                             Pcd.MaxDatumSize = str(MaxSize)

             else:

-                PcdInDec = self.DecPcds.get((Name,Guid))

+                PcdInDec = self.DecPcds.get((Name, Guid))

                 if PcdInDec:

-                    PcdInDec.PcdValueFromComm = NoFiledValues[(Guid,Name)][0]

+                    PcdInDec.PcdValueFromComm = NoFiledValues[(Guid, Name)][0]

                     if PcdInDec.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD],

                                         self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE],

                                         self._PCD_TYPE_STRING_[MODEL_PCD_FEATURE_FLAG]]:

                         self.Pcds[Name, Guid] = copy.deepcopy(PcdInDec)

-                        self.Pcds[Name, Guid].DefaultValue = NoFiledValues[( Guid,Name)][0]

+                        self.Pcds[Name, Guid].DefaultValue = NoFiledValues[( Guid, Name)][0]

         return AllPcds

     def UpdateStructuredPcds(self, TypeList, AllPcds):

 

@@ -1281,7 +1281,7 @@ class DscBuildData(PlatformBuildClassObject):
         for Type in TypeList:

             RecordList.extend(self._RawData[Type, self._Arch])

 

-        for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, default_store, Dummy4,Dummy5 in RecordList:

+        for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, default_store, Dummy4, Dummy5 in RecordList:

             SkuName = SkuName.upper()

             default_store = default_store.upper()

             SkuName = TAB_DEFAULT if SkuName == TAB_COMMON else SkuName

@@ -1289,7 +1289,7 @@ class DscBuildData(PlatformBuildClassObject):
                 continue

 

             if SkuName in SkuIds and "." in TokenSpaceGuid:

-                S_PcdSet.append([ TokenSpaceGuid.split(".")[0],TokenSpaceGuid.split(".")[1], PcdCName,SkuName, default_store,Dummy5, AnalyzePcdExpression(Setting)[0]])

+                S_PcdSet.append([ TokenSpaceGuid.split(".")[0], TokenSpaceGuid.split(".")[1], PcdCName, SkuName, default_store, Dummy5, AnalyzePcdExpression(Setting)[0]])

 

         # handle pcd value override

         StrPcdSet = DscBuildData.GetStructurePcdInfo(S_PcdSet)

@@ -1300,7 +1300,7 @@ class DscBuildData(PlatformBuildClassObject):
             if not isinstance (str_pcd_dec, StructurePcd):

                 EdkLogger.error('build', PARSER_ERROR,

                             "Pcd (%s.%s) is not declared as Structure PCD in DEC files. Arch: ['%s']" % (str_pcd[0], str_pcd[1], self._Arch),

-                            File=self.MetaFile,Line = StrPcdSet[str_pcd][0][5])

+                            File=self.MetaFile, Line = StrPcdSet[str_pcd][0][5])

             if str_pcd_dec:

                 str_pcd_obj_str = StructurePcd()

                 str_pcd_obj_str.copy(str_pcd_dec)

@@ -1312,12 +1312,12 @@ class DscBuildData(PlatformBuildClassObject):
                         str_pcd_obj_str.DefaultFromDSC = {skuname:{defaultstore: str_pcd_obj.SkuInfoList[skuname].DefaultStoreDict.get(defaultstore, str_pcd_obj.SkuInfoList[skuname].DefaultValue) for defaultstore in DefaultStores} for skuname in str_pcd_obj.SkuInfoList}

                 for str_pcd_data in StrPcdSet[str_pcd]:

                     if str_pcd_data[3] in SkuIds:

-                        str_pcd_obj_str.AddOverrideValue(str_pcd_data[2], str(str_pcd_data[6]), TAB_DEFAULT if str_pcd_data[3] == TAB_COMMON else str_pcd_data[3],TAB_DEFAULT_STORES_DEFAULT if str_pcd_data[4] == TAB_COMMON else str_pcd_data[4], self.MetaFile.File if self.WorkspaceDir not in self.MetaFile.File else self.MetaFile.File[len(self.WorkspaceDir) if self.WorkspaceDir.endswith(os.path.sep) else len(self.WorkspaceDir)+1:],LineNo=str_pcd_data[5])

+                        str_pcd_obj_str.AddOverrideValue(str_pcd_data[2], str(str_pcd_data[6]), TAB_DEFAULT if str_pcd_data[3] == TAB_COMMON else str_pcd_data[3], TAB_DEFAULT_STORES_DEFAULT if str_pcd_data[4] == TAB_COMMON else str_pcd_data[4], self.MetaFile.File if self.WorkspaceDir not in self.MetaFile.File else self.MetaFile.File[len(self.WorkspaceDir) if self.WorkspaceDir.endswith(os.path.sep) else len(self.WorkspaceDir)+1:], LineNo=str_pcd_data[5])

                 S_pcd_set[str_pcd[1], str_pcd[0]] = str_pcd_obj_str

             else:

                 EdkLogger.error('build', PARSER_ERROR,

                             "Pcd (%s.%s) defined in DSC is not declared in DEC files. Arch: ['%s']" % (str_pcd[0], str_pcd[1], self._Arch),

-                            File=self.MetaFile,Line = StrPcdSet[str_pcd][0][5])

+                            File=self.MetaFile, Line = StrPcdSet[str_pcd][0][5])

         # Add the Structure PCD that only defined in DEC, don't have override in DSC file

         for Pcd in self.DecPcds:

             if type (self._DecPcds[Pcd]) is StructurePcd:

@@ -1348,7 +1348,7 @@ class DscBuildData(PlatformBuildClassObject):
                         nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)

                     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})

                     if not NoDefault:

-                        stru_pcd.ValueChain.add((skuid,''))

+                        stru_pcd.ValueChain.add((skuid, ''))

             if stru_pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]:

                 for skuid in SkuIds:

                     nextskuid = skuid

@@ -1367,11 +1367,11 @@ class DscBuildData(PlatformBuildClassObject):
                     for defaultstoreid in DefaultStores:

                         if defaultstoreid not in stru_pcd.SkuOverrideValues[skuid]:

                             stru_pcd.SkuOverrideValues[skuid][defaultstoreid] = copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstorename])

-                            stru_pcd.ValueChain.add((skuid,defaultstoreid))

+                            stru_pcd.ValueChain.add((skuid, defaultstoreid))

         S_pcd_set = DscBuildData.OverrideByFdfComm(S_pcd_set)

         Str_Pcd_Values = self.GenerateByteArrayValue(S_pcd_set)

         if Str_Pcd_Values:

-            for (skuname,StoreName,PcdGuid,PcdName,PcdValue) in Str_Pcd_Values:

+            for (skuname, StoreName, PcdGuid, PcdName, PcdValue) in Str_Pcd_Values:

                 str_pcd_obj = S_pcd_set.get((PcdName, PcdGuid))

                 if str_pcd_obj is None:

                     print(PcdName, PcdGuid)

@@ -1423,7 +1423,7 @@ class DscBuildData(PlatformBuildClassObject):
                 elif TAB_DEFAULT in pcd.SkuInfoList and TAB_COMMON in pcd.SkuInfoList:

                     del pcd.SkuInfoList[TAB_COMMON]

 

-        map(self.FilterSkuSettings,[Pcds[pcdkey] for pcdkey in Pcds if Pcds[pcdkey].Type in DynamicPcdType])

+        map(self.FilterSkuSettings, [Pcds[pcdkey] for pcdkey in Pcds if Pcds[pcdkey].Type in DynamicPcdType])

         return Pcds

 

     ## Retrieve non-dynamic PCD settings

@@ -1445,7 +1445,7 @@ class DscBuildData(PlatformBuildClassObject):
         # Find out all possible PCD candidates for self._Arch

         RecordList = self._RawData[Type, self._Arch]

         PcdValueDict = OrderedDict()

-        for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4,Dummy5 in RecordList:

+        for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4, Dummy5 in RecordList:

             SkuName = SkuName.upper()

             SkuName = TAB_DEFAULT if SkuName == TAB_COMMON else SkuName

             if SkuName not in AvailableSkuIdSet:

@@ -1466,7 +1466,7 @@ class DscBuildData(PlatformBuildClassObject):
             else:

                 PcdValueDict[PcdCName, TokenSpaceGuid] = {SkuName:(PcdValue, DatumType, MaxDatumSize)}

 

-        for ((PcdCName,TokenSpaceGuid),PcdSetting) in PcdValueDict.iteritems():

+        for ((PcdCName, TokenSpaceGuid), PcdSetting) in PcdValueDict.iteritems():

             PcdValue = None

             DatumType = None

             MaxDatumSize = None

@@ -1536,7 +1536,7 @@ class DscBuildData(PlatformBuildClassObject):
         Result = Result + '"'

         return Result

 

-    def GenerateSizeFunction(self,Pcd):

+    def GenerateSizeFunction(self, Pcd):

         CApp = "// Default Value in Dec \n"

         CApp = CApp + "void Cal_%s_%s_Size(UINT32 *Size){\n" % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName)

         for FieldList in [Pcd.DefaultValues]:

@@ -1618,7 +1618,7 @@ class DscBuildData(PlatformBuildClassObject):
                 while '[' in FieldName:

                     FieldName = FieldName.rsplit('[', 1)[0]

                     CApp = CApp + '  __FLEXIBLE_SIZE(*Size, %s, %s, %d); // From %s Line %d Value %s \n' % (Pcd.DatumType, FieldName.strip("."), ArrayIndex + 1, Pcd.PcdFieldValueFromComm[FieldName_ori][1], Pcd.PcdFieldValueFromComm[FieldName_ori][2], Pcd.PcdFieldValueFromComm[FieldName_ori][0])

-        CApp = CApp + "  *Size = (%d > *Size ? %d : *Size); // The Pcd maxsize is %d \n" % (Pcd.GetPcdMaxSize(),Pcd.GetPcdMaxSize(),Pcd.GetPcdMaxSize())

+        CApp = CApp + "  *Size = (%d > *Size ? %d : *Size); // The Pcd maxsize is %d \n" % (Pcd.GetPcdMaxSize(), Pcd.GetPcdMaxSize(), Pcd.GetPcdMaxSize())

         CApp = CApp + "}\n"

         return CApp

 

@@ -1628,9 +1628,9 @@ class DscBuildData(PlatformBuildClassObject):
         CApp = CApp + '  Cal_%s_%s_Size(&Size);\n' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName)

         return CApp

 

-    def GenerateDefaultValueAssignFunction(self,Pcd):

+    def GenerateDefaultValueAssignFunction(self, Pcd):

         CApp = "// Default value in Dec \n"

-        CApp = CApp + "void Assign_%s_%s_Default_Value(%s *Pcd){\n" % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName,Pcd.DatumType)

+        CApp = CApp + "void Assign_%s_%s_Default_Value(%s *Pcd){\n" % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Pcd.DatumType)

         CApp = CApp + '  UINT32  FieldSize;\n'

         CApp = CApp + '  CHAR8   *Value;\n'

         DefaultValueFromDec = Pcd.DefaultValueFromDec

@@ -1661,12 +1661,12 @@ class DscBuildData(PlatformBuildClassObject):
                         FieldList[FieldName][0] = ValueExpressionEx(FieldList[FieldName][0], TAB_VOID, self._GuidDict)(True)

                     except BadExpression:

                         EdkLogger.error('Build', FORMAT_INVALID, "Invalid value format for %s. From %s Line %d " %

-                                        (".".join((Pcd.TokenSpaceGuidCName, Pcd.TokenCName, FieldName)), FieldList[FieldName][1],FieldList[FieldName][2]))

+                                        (".".join((Pcd.TokenSpaceGuidCName, Pcd.TokenCName, FieldName)), FieldList[FieldName][1], FieldList[FieldName][2]))

 

                 try:

                     Value, ValueSize = ParseFieldValue (FieldList[FieldName][0])

                 except Exception:

-                    EdkLogger.error('Build', FORMAT_INVALID, "Invalid value format for %s. From %s Line %d " % (".".join((Pcd.TokenSpaceGuidCName,Pcd.TokenCName,FieldName)),FieldList[FieldName][1], FieldList[FieldName][2]))

+                    EdkLogger.error('Build', FORMAT_INVALID, "Invalid value format for %s. From %s Line %d " % (".".join((Pcd.TokenSpaceGuidCName, Pcd.TokenCName, FieldName)), FieldList[FieldName][1], FieldList[FieldName][2]))

                 if isinstance(Value, str):

                     CApp = CApp + '  Pcd->%s = %s; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])

                 elif IsArray:

@@ -1689,22 +1689,22 @@ class DscBuildData(PlatformBuildClassObject):
         CApp = '  Assign_%s_%s_Default_Value(Pcd);\n' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName)

         return CApp

 

-    def GenerateInitValueFunction(self,Pcd,SkuName,DefaultStoreName):

-        CApp = "// Value in Dsc for Sku: %s, DefaultStore %s\n" % (SkuName,DefaultStoreName)

-        CApp = CApp + "void Assign_%s_%s_%s_%s_Value(%s *Pcd){\n" % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName,SkuName,DefaultStoreName,Pcd.DatumType)

+    def GenerateInitValueFunction(self, Pcd, SkuName, DefaultStoreName):

+        CApp = "// Value in Dsc for Sku: %s, DefaultStore %s\n" % (SkuName, DefaultStoreName)

+        CApp = CApp + "void Assign_%s_%s_%s_%s_Value(%s *Pcd){\n" % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, SkuName, DefaultStoreName, Pcd.DatumType)

         CApp = CApp + '  UINT32  FieldSize;\n'

         CApp = CApp + '  CHAR8   *Value;\n'

 

         CApp = CApp + "// SkuName: %s,  DefaultStoreName: %s \n" % (TAB_DEFAULT, TAB_DEFAULT_STORES_DEFAULT)

         inherit_OverrideValues = Pcd.SkuOverrideValues[SkuName]

-        if (SkuName,DefaultStoreName) == (TAB_DEFAULT,TAB_DEFAULT_STORES_DEFAULT):

-            pcddefaultvalue = Pcd.DefaultFromDSC.get(TAB_DEFAULT,{}).get(TAB_DEFAULT_STORES_DEFAULT, Pcd.DefaultValue) if Pcd.DefaultFromDSC else Pcd.DefaultValue

+        if (SkuName, DefaultStoreName) == (TAB_DEFAULT, TAB_DEFAULT_STORES_DEFAULT):

+            pcddefaultvalue = Pcd.DefaultFromDSC.get(TAB_DEFAULT, {}).get(TAB_DEFAULT_STORES_DEFAULT, Pcd.DefaultValue) if Pcd.DefaultFromDSC else Pcd.DefaultValue

         else:

             if not Pcd.DscRawValue:

                 # handle the case that structure pcd is not appear in DSC

                 self.CopyDscRawValue(Pcd)

-            pcddefaultvalue = Pcd.DscRawValue.get(SkuName,{}).get(DefaultStoreName)

-        for FieldList in [pcddefaultvalue,inherit_OverrideValues.get(DefaultStoreName)]:

+            pcddefaultvalue = Pcd.DscRawValue.get(SkuName, {}).get(DefaultStoreName)

+        for FieldList in [pcddefaultvalue, inherit_OverrideValues.get(DefaultStoreName)]:

             if not FieldList:

                 continue

             if pcddefaultvalue and FieldList == pcddefaultvalue:

@@ -1717,26 +1717,26 @@ class DscBuildData(PlatformBuildClassObject):
                                         (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, FieldList))

                 Value, ValueSize = ParseFieldValue (FieldList)

 

-                if (SkuName,DefaultStoreName) == (TAB_DEFAULT,TAB_DEFAULT_STORES_DEFAULT):

+                if (SkuName, DefaultStoreName) == (TAB_DEFAULT, TAB_DEFAULT_STORES_DEFAULT):

                     if isinstance(Value, str):

-                        CApp = CApp + '  Pcd = %s; // From DSC Default Value %s\n' % (Value, Pcd.DefaultFromDSC.get(TAB_DEFAULT,{}).get(TAB_DEFAULT_STORES_DEFAULT, Pcd.DefaultValue) if Pcd.DefaultFromDSC else Pcd.DefaultValue)

+                        CApp = CApp + '  Pcd = %s; // From DSC Default Value %s\n' % (Value, Pcd.DefaultFromDSC.get(TAB_DEFAULT, {}).get(TAB_DEFAULT_STORES_DEFAULT, Pcd.DefaultValue) if Pcd.DefaultFromDSC else Pcd.DefaultValue)

                     elif IsArray:

                     #

                     # Use memcpy() to copy value into field

                     #

-                        CApp = CApp + '  Value     = %s; // From DSC Default Value %s\n' % (DscBuildData.IntToCString(Value, ValueSize), Pcd.DefaultFromDSC.get(TAB_DEFAULT,{}).get(TAB_DEFAULT_STORES_DEFAULT, Pcd.DefaultValue) if Pcd.DefaultFromDSC else Pcd.DefaultValue)

+                        CApp = CApp + '  Value     = %s; // From DSC Default Value %s\n' % (DscBuildData.IntToCString(Value, ValueSize), Pcd.DefaultFromDSC.get(TAB_DEFAULT, {}).get(TAB_DEFAULT_STORES_DEFAULT, Pcd.DefaultValue) if Pcd.DefaultFromDSC else Pcd.DefaultValue)

                         CApp = CApp + '  memcpy (Pcd, Value, %d);\n' % (ValueSize)

                 else:

                     if isinstance(Value, str):

-                        CApp = CApp + '  Pcd = %s; // From DSC Default Value %s\n' % (Value, Pcd.DscRawValue.get(SkuName,{}).get(DefaultStoreName))

+                        CApp = CApp + '  Pcd = %s; // From DSC Default Value %s\n' % (Value, Pcd.DscRawValue.get(SkuName, {}).get(DefaultStoreName))

                     elif IsArray:

                     #

                     # Use memcpy() to copy value into field

                     #

-                        CApp = CApp + '  Value     = %s; // From DSC Default Value %s\n' % (DscBuildData.IntToCString(Value, ValueSize), Pcd.DscRawValue.get(SkuName,{}).get(DefaultStoreName))

+                        CApp = CApp + '  Value     = %s; // From DSC Default Value %s\n' % (DscBuildData.IntToCString(Value, ValueSize), Pcd.DscRawValue.get(SkuName, {}).get(DefaultStoreName))

                         CApp = CApp + '  memcpy (Pcd, Value, %d);\n' % (ValueSize)

                 continue

-            if (SkuName,DefaultStoreName) == (TAB_DEFAULT,TAB_DEFAULT_STORES_DEFAULT) or (( (SkuName,'') not in Pcd.ValueChain) and ( (SkuName,DefaultStoreName) not in Pcd.ValueChain )):

+            if (SkuName, DefaultStoreName) == (TAB_DEFAULT, TAB_DEFAULT_STORES_DEFAULT) or (( (SkuName, '') not in Pcd.ValueChain) and ( (SkuName, DefaultStoreName) not in Pcd.ValueChain )):

                 for FieldName in FieldList:

                     IsArray = IsFieldValueAnArray(FieldList[FieldName][0])

                     if IsArray:

@@ -1748,7 +1748,7 @@ class DscBuildData(PlatformBuildClassObject):
                     try:

                         Value, ValueSize = ParseFieldValue (FieldList[FieldName][0])

                     except Exception:

-                        EdkLogger.error('Build', FORMAT_INVALID, "Invalid value format for %s. From %s Line %d " % (".".join((Pcd.TokenSpaceGuidCName,Pcd.TokenCName,FieldName)),FieldList[FieldName][1], FieldList[FieldName][2]))

+                        EdkLogger.error('Build', FORMAT_INVALID, "Invalid value format for %s. From %s Line %d " % (".".join((Pcd.TokenSpaceGuidCName, Pcd.TokenCName, FieldName)), FieldList[FieldName][1], FieldList[FieldName][2]))

                     if isinstance(Value, str):

                         CApp = CApp + '  Pcd->%s = %s; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])

                     elif IsArray:

@@ -1767,18 +1767,18 @@ class DscBuildData(PlatformBuildClassObject):
         return CApp

 

     @staticmethod

-    def GenerateInitValueStatement(Pcd,SkuName,DefaultStoreName):

-        CApp = '  Assign_%s_%s_%s_%s_Value(Pcd);\n' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName,SkuName,DefaultStoreName)

+    def GenerateInitValueStatement(Pcd, SkuName, DefaultStoreName):

+        CApp = '  Assign_%s_%s_%s_%s_Value(Pcd);\n' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, SkuName, DefaultStoreName)

         return CApp

 

-    def GenerateCommandLineValue(self,Pcd):

+    def GenerateCommandLineValue(self, Pcd):

         CApp = "// Value in CommandLine\n"

-        CApp = CApp + "void Assign_%s_%s_CommandLine_Value(%s *Pcd){\n" % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName,Pcd.DatumType)

+        CApp = CApp + "void Assign_%s_%s_CommandLine_Value(%s *Pcd){\n" % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Pcd.DatumType)

         CApp = CApp + '  UINT32  FieldSize;\n'

         CApp = CApp + '  CHAR8   *Value;\n'

 

         pcddefaultvalue = Pcd.PcdValueFromComm

-        for FieldList in [pcddefaultvalue,Pcd.PcdFieldValueFromComm]:

+        for FieldList in [pcddefaultvalue, Pcd.PcdFieldValueFromComm]:

             if not FieldList:

                 continue

             if pcddefaultvalue and FieldList == pcddefaultvalue:

@@ -1813,7 +1813,7 @@ class DscBuildData(PlatformBuildClassObject):
                 try:

                     Value, ValueSize = ParseFieldValue (FieldList[FieldName][0])

                 except Exception:

-                    EdkLogger.error('Build', FORMAT_INVALID, "Invalid value format for %s. From %s Line %d " % (".".join((Pcd.TokenSpaceGuidCName,Pcd.TokenCName,FieldName)),FieldList[FieldName][1], FieldList[FieldName][2]))

+                    EdkLogger.error('Build', FORMAT_INVALID, "Invalid value format for %s. From %s Line %d " % (".".join((Pcd.TokenSpaceGuidCName, Pcd.TokenCName, FieldName)), FieldList[FieldName][1], FieldList[FieldName][2]))

                 if isinstance(Value, str):

                     CApp = CApp + '  Pcd->%s = %s; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])

                 elif IsArray:

@@ -1855,7 +1855,7 @@ class DscBuildData(PlatformBuildClassObject):
             CApp = CApp + '\n'

 

             if SkuName in Pcd.SkuInfoList:

-                DefaultValue = Pcd.SkuInfoList[SkuName].DefaultStoreDict.get(DefaultStoreName,Pcd.SkuInfoList[SkuName].HiiDefaultValue if Pcd.SkuInfoList[SkuName].HiiDefaultValue  else Pcd.SkuInfoList[SkuName].DefaultValue)

+                DefaultValue = Pcd.SkuInfoList[SkuName].DefaultStoreDict.get(DefaultStoreName, Pcd.SkuInfoList[SkuName].HiiDefaultValue if Pcd.SkuInfoList[SkuName].HiiDefaultValue  else Pcd.SkuInfoList[SkuName].DefaultValue)

             else:

                 DefaultValue = Pcd.DefaultValue

             PcdDefaultValue = StringToArray(DefaultValue.strip())

@@ -1901,12 +1901,12 @@ class DscBuildData(PlatformBuildClassObject):
                     storeset = [DefaultStoreName] if DefaultStoreName == TAB_DEFAULT_STORES_DEFAULT else [TAB_DEFAULT_STORES_DEFAULT, DefaultStoreName]

                     for defaultstorenameitem in storeset:

                         CApp = CApp + "// SkuName: %s,  DefaultStoreName: %s \n" % (skuname, defaultstorenameitem)

-                        CApp = CApp + DscBuildData.GenerateInitValueStatement(Pcd,skuname,defaultstorenameitem)

+                        CApp = CApp + DscBuildData.GenerateInitValueStatement(Pcd, skuname, defaultstorenameitem)

                     if skuname == SkuName:

                         break

             else:

                 CApp = CApp + "// SkuName: %s,  DefaultStoreName: STANDARD \n" % self.SkuIdMgr.SystemSkuId

-                CApp = CApp + DscBuildData.GenerateInitValueStatement(Pcd,self.SkuIdMgr.SystemSkuId,TAB_DEFAULT_STORES_DEFAULT)

+                CApp = CApp + DscBuildData.GenerateInitValueStatement(Pcd, self.SkuIdMgr.SystemSkuId, TAB_DEFAULT_STORES_DEFAULT)

             CApp = CApp + DscBuildData.GenerateCommandLineValueStatement(Pcd)

             #

             # Set new PCD value and size

@@ -1946,13 +1946,13 @@ class DscBuildData(PlatformBuildClassObject):
             CApp = CApp + self.GenerateCommandLineValue(Pcd)

             if not Pcd.SkuOverrideValues or Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD],

                         self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE]]:

-                CApp = CApp + self.GenerateInitValueFunction(Pcd,self.SkuIdMgr.SystemSkuId, TAB_DEFAULT_STORES_DEFAULT)

+                CApp = CApp + self.GenerateInitValueFunction(Pcd, self.SkuIdMgr.SystemSkuId, TAB_DEFAULT_STORES_DEFAULT)

             else:

                 for SkuName in self.SkuIdMgr.SkuOverrideOrder():

                     if SkuName not in Pcd.SkuOverrideValues:

                         continue

                     for DefaultStoreName in Pcd.SkuOverrideValues[SkuName]:

-                        CApp = CApp + self.GenerateInitValueFunction(Pcd,SkuName,DefaultStoreName)

+                        CApp = CApp + self.GenerateInitValueFunction(Pcd, SkuName, DefaultStoreName)

             if not Pcd.SkuOverrideValues or Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD],

                         self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE]]:

                 InitByteValue, CApp = self.GenerateInitializeFunc(self.SkuIdMgr.SystemSkuId, TAB_DEFAULT_STORES_DEFAULT, Pcd, InitByteValue, CApp)

@@ -1970,7 +1970,7 @@ class DscBuildData(PlatformBuildClassObject):
         CApp = CApp + '  )\n'

         CApp = CApp + '{\n'

         for Pcd in StructuredPcds.values():

-            if not Pcd.SkuOverrideValues or Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD],self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE]]:

+            if not Pcd.SkuOverrideValues or Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD], self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE]]:

                 CApp = CApp + '  Initialize_%s_%s_%s_%s();\n' % (self.SkuIdMgr.SystemSkuId, TAB_DEFAULT_STORES_DEFAULT, Pcd.TokenSpaceGuidCName, Pcd.TokenCName)

             else:

                 for SkuName in self.SkuIdMgr.SkuOverrideOrder():

@@ -2072,7 +2072,7 @@ class DscBuildData(PlatformBuildClassObject):
         IncludeFileFullPaths = []

         for includefile in IncludeFiles:

             for includepath in IncSearchList:

-                includefullpath = os.path.join(str(includepath),includefile)

+                includefullpath = os.path.join(str(includepath), includefile)

                 if os.path.exists(includefullpath):

                     IncludeFileFullPaths.append(os.path.normpath(includefullpath))

                     break

@@ -2080,7 +2080,7 @@ class DscBuildData(PlatformBuildClassObject):
         SearchPathList.append(os.path.normpath(mws.join(GlobalData.gWorkspace, "BaseTools/Source/C/Include")))

         SearchPathList.append(os.path.normpath(mws.join(GlobalData.gWorkspace, "BaseTools/Source/C/Common")))

         SearchPathList.extend(str(item) for item in IncSearchList)

-        IncFileList = GetDependencyList(IncludeFileFullPaths,SearchPathList)

+        IncFileList = GetDependencyList(IncludeFileFullPaths, SearchPathList)

         for include_file in IncFileList:

             MakeApp += "$(OBJECTS) : %s\n" % include_file

         MakeFileName = os.path.join(self.OutputPath, 'Makefile')

@@ -2126,7 +2126,7 @@ class DscBuildData(PlatformBuildClassObject):
                     if FileLine.isdigit():

                         error_line = FileData[int (FileLine) - 1]

                         if r"//" in error_line:

-                            c_line,dsc_line = error_line.split(r"//")

+                            c_line, dsc_line = error_line.split(r"//")

                         else:

                             dsc_line = error_line

                         message_itmes = Message.split(":")

@@ -2150,7 +2150,7 @@ class DscBuildData(PlatformBuildClassObject):
             else:

                 EdkLogger.error('Build', COMMAND_FAILURE, 'Can not execute command: %s' % MakeCommand)

 

-        if DscBuildData.NeedUpdateOutput(OutputValueFile, PcdValueInitExe ,InputValueFile):

+        if DscBuildData.NeedUpdateOutput(OutputValueFile, PcdValueInitExe, InputValueFile):

             Command = PcdValueInitExe + ' -i %s -o %s' % (InputValueFile, OutputValueFile)

             returncode, StdOut, StdErr = DscBuildData.ExecuteCommand (Command)

             if returncode != 0:

@@ -2164,7 +2164,7 @@ class DscBuildData(PlatformBuildClassObject):
         for Pcd in FileBuffer:

             PcdValue = Pcd.split ('|')

             PcdInfo = PcdValue[0].split ('.')

-            StructurePcdSet.append((PcdInfo[0],PcdInfo[1], PcdInfo[2], PcdInfo[3], PcdValue[2].strip()))

+            StructurePcdSet.append((PcdInfo[0], PcdInfo[1], PcdInfo[2], PcdInfo[3], PcdValue[2].strip()))

         return StructurePcdSet

 

     @staticmethod

@@ -2198,7 +2198,7 @@ class DscBuildData(PlatformBuildClassObject):
         AvailableSkuIdSet = copy.copy(self.SkuIds)

 

 

-        for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4,Dummy5 in RecordList:

+        for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4, Dummy5 in RecordList:

             SkuName = SkuName.upper()

             SkuName = TAB_DEFAULT if SkuName == TAB_COMMON else SkuName

             if SkuName not in AvailableSkuIdSet:

@@ -2260,7 +2260,7 @@ class DscBuildData(PlatformBuildClassObject):
             elif TAB_DEFAULT in pcd.SkuInfoList and TAB_COMMON in pcd.SkuInfoList:

                 del pcd.SkuInfoList[TAB_COMMON]

 

-        map(self.FilterSkuSettings,Pcds.values())

+        map(self.FilterSkuSettings, Pcds.values())

 

         return Pcds

 

@@ -2291,7 +2291,7 @@ class DscBuildData(PlatformBuildClassObject):
         else:

             return False

 

-    def CopyDscRawValue(self,Pcd):

+    def CopyDscRawValue(self, Pcd):

         if Pcd.DscRawValue is None:

             Pcd.DscRawValue = dict()

         if Pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD], self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE]]:

@@ -2305,10 +2305,10 @@ class DscBuildData(PlatformBuildClassObject):
                     Pcd.DscRawValue[skuname][defaultstore] = Pcd.SkuInfoList[skuname].DefaultStoreDict[defaultstore]

             else:

                 Pcd.DscRawValue[skuname][TAB_DEFAULT_STORES_DEFAULT] = Pcd.SkuInfoList[skuname].DefaultValue

-    def CompletePcdValues(self,PcdSet):

+    def CompletePcdValues(self, PcdSet):

         Pcds = {}

         DefaultStoreObj = DefaultStore(self._GetDefaultStores())

-        SkuIds = {skuname:skuid for skuname,skuid in self.SkuIdMgr.AvailableSkuIdSet.items() if skuname != TAB_COMMON}

+        SkuIds = {skuname:skuid for skuname, skuid in self.SkuIdMgr.AvailableSkuIdSet.items() if skuname != TAB_COMMON}

         DefaultStores = set(storename for pcdobj in PcdSet.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict)

         for PcdCName, TokenSpaceGuid in PcdSet:

             PcdObj = PcdSet[(PcdCName, TokenSpaceGuid)]

@@ -2330,7 +2330,7 @@ class DscBuildData(PlatformBuildClassObject):
                         if defaultstorename not in skuobj.DefaultStoreDict:

                             skuobj.DefaultStoreDict[defaultstorename] = copy.deepcopy(skuobj.DefaultStoreDict[mindefaultstorename])

                     skuobj.HiiDefaultValue = skuobj.DefaultStoreDict[mindefaultstorename]

-            for skuname,skuid in SkuIds.items():

+            for skuname, skuid in SkuIds.items():

                 if skuname not in PcdObj.SkuInfoList:

                     nextskuid = self.SkuIdMgr.GetNextSkuId(skuname)

                     while nextskuid not in PcdObj.SkuInfoList:

@@ -2364,7 +2364,7 @@ class DscBuildData(PlatformBuildClassObject):
         AvailableSkuIdSet = copy.copy(self.SkuIds)

         DefaultStoresDefine = self._GetDefaultStores()

 

-        for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, DefaultStore, Dummy4,Dummy5 in RecordList:

+        for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, DefaultStore, Dummy4, Dummy5 in RecordList:

             SkuName = SkuName.upper()

             SkuName = TAB_DEFAULT if SkuName == TAB_COMMON else SkuName

             DefaultStore = DefaultStore.upper()

@@ -2377,14 +2377,14 @@ class DscBuildData(PlatformBuildClassObject):
                 EdkLogger.error('build', PARAMETER_INVALID, 'DefaultStores %s is not defined in [DefaultStores] section' % DefaultStore,

                                             File=self.MetaFile, Line=Dummy5)

             if "." not in TokenSpaceGuid:

-                PcdSet.add((PcdCName, TokenSpaceGuid, SkuName,DefaultStore, Dummy5))

-            PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid,DefaultStore] = Setting

+                PcdSet.add((PcdCName, TokenSpaceGuid, SkuName, DefaultStore, Dummy5))

+            PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid, DefaultStore] = Setting

 

 

         # Remove redundant PCD candidates, per the ARCH and SKU

-        for PcdCName, TokenSpaceGuid, SkuName,DefaultStore, Dummy4 in PcdSet:

+        for PcdCName, TokenSpaceGuid, SkuName, DefaultStore, Dummy4 in PcdSet:

 

-            Setting = PcdDict[self._Arch, SkuName, PcdCName, TokenSpaceGuid,DefaultStore]

+            Setting = PcdDict[self._Arch, SkuName, PcdCName, TokenSpaceGuid, DefaultStore]

             if Setting is None:

                 continue

             VariableName, VariableGuid, VariableOffset, DefaultValue, VarAttribute = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)

@@ -2428,10 +2428,10 @@ class DscBuildData(PlatformBuildClassObject):
                     Skuitem = pcdObject.SkuInfoList[SkuName]

                     Skuitem.DefaultStoreDict.update({DefaultStore:DefaultValue})

                 else:

-                    SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName][0], VariableName, VariableGuid, VariableOffset, DefaultValue, VariableAttribute=VarAttribute,DefaultStore={DefaultStore:DefaultValue})

+                    SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName][0], VariableName, VariableGuid, VariableOffset, DefaultValue, VariableAttribute=VarAttribute, DefaultStore={DefaultStore:DefaultValue})

                     pcdObject.SkuInfoList[SkuName] = SkuInfo

             else:

-                SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName][0], VariableName, VariableGuid, VariableOffset, DefaultValue, VariableAttribute=VarAttribute,DefaultStore={DefaultStore:DefaultValue})

+                SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName][0], VariableName, VariableGuid, VariableOffset, DefaultValue, VariableAttribute=VarAttribute, DefaultStore={DefaultStore:DefaultValue})

                 Pcds[PcdCName, TokenSpaceGuid] = PcdClassObject(

                                                 PcdCName,

                                                 TokenSpaceGuid,

@@ -2462,7 +2462,7 @@ class DscBuildData(PlatformBuildClassObject):
                     pcd.DefaultValue = pcdDecObject.DefaultValue

             if TAB_DEFAULT not in pcd.SkuInfoList and TAB_COMMON not in pcd.SkuInfoList:

                 valuefromDec = pcdDecObject.DefaultValue

-                SkuInfo = SkuInfoClass(TAB_DEFAULT, '0', SkuInfoObj.VariableName, SkuInfoObj.VariableGuid, SkuInfoObj.VariableOffset, valuefromDec,VariableAttribute=SkuInfoObj.VariableAttribute,DefaultStore={DefaultStore:valuefromDec})

+                SkuInfo = SkuInfoClass(TAB_DEFAULT, '0', SkuInfoObj.VariableName, SkuInfoObj.VariableGuid, SkuInfoObj.VariableOffset, valuefromDec, VariableAttribute=SkuInfoObj.VariableAttribute, DefaultStore={DefaultStore:valuefromDec})

                 pcd.SkuInfoList[TAB_DEFAULT] = SkuInfo

             elif TAB_DEFAULT not in pcd.SkuInfoList and TAB_COMMON in pcd.SkuInfoList:

                 pcd.SkuInfoList[TAB_DEFAULT] = pcd.SkuInfoList[TAB_COMMON]

@@ -2490,7 +2490,7 @@ class DscBuildData(PlatformBuildClassObject):
             invalidpcd = ",".join(invalidhii)

             EdkLogger.error('build', PCD_VARIABLE_INFO_ERROR, Message='The same HII PCD must map to the same EFI variable for all SKUs', File=self.MetaFile, ExtraData=invalidpcd)

 

-        map(self.FilterSkuSettings,Pcds.values())

+        map(self.FilterSkuSettings, Pcds.values())

 

         return Pcds

 

@@ -2499,11 +2499,11 @@ class DscBuildData(PlatformBuildClassObject):
         invalidhii = []

         for pcdname in Pcds:

             pcd = Pcds[pcdname]

-            varnameset = set(sku.VariableName for (skuid,sku) in pcd.SkuInfoList.items())

+            varnameset = set(sku.VariableName for (skuid, sku) in pcd.SkuInfoList.items())

             if len(varnameset) > 1:

-                invalidhii.append(".".join((pcdname[1],pcdname[0])))

+                invalidhii.append(".".join((pcdname[1], pcdname[0])))

         if len(invalidhii):

-            return False,invalidhii

+            return False, invalidhii

         else:

             return True, []

     ## Retrieve dynamic VPD PCD settings

@@ -2527,7 +2527,7 @@ class DscBuildData(PlatformBuildClassObject):
         RecordList = self._RawData[Type, self._Arch]

         AvailableSkuIdSet = copy.copy(self.SkuIds)

 

-        for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4,Dummy5 in RecordList:

+        for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4, Dummy5 in RecordList:

             SkuName = SkuName.upper()

             SkuName = TAB_DEFAULT if SkuName == TAB_COMMON else SkuName

             if SkuName not in AvailableSkuIdSet:

@@ -2595,7 +2595,7 @@ class DscBuildData(PlatformBuildClassObject):
                 del pcd.SkuInfoList[TAB_COMMON]

 

 

-        map(self.FilterSkuSettings,Pcds.values())

+        map(self.FilterSkuSettings, Pcds.values())

         return Pcds

 

     ## Add external modules

@@ -2660,7 +2660,7 @@ class DscBuildData(PlatformBuildClassObject):
                     continue

                 ModuleData = self._Bdb[ModuleFile, self._Arch, self._Target, self._Toolchain]

                 PkgSet.update(ModuleData.Packages)

-            self._DecPcds, self._GuidDict = GetDeclaredPcd(self, self._Bdb, self._Arch, self._Target, self._Toolchain,PkgSet)

+            self._DecPcds, self._GuidDict = GetDeclaredPcd(self, self._Bdb, self._Arch, self._Target, self._Toolchain, PkgSet)

         return self._DecPcds

     _Macros             = property(_GetMacros)

     Arch                = property(_GetArch, _SetArch)

diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index d5fbf6f095..4ab3c137dd 100644
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -302,7 +302,7 @@ class MetaFileParser(object):
         for Item in GetSplitValueList(self._CurrentLine[1:-1], TAB_COMMA_SPLIT):

             if Item == '':

                 continue

-            ItemList = GetSplitValueList(Item, TAB_SPLIT,3)

+            ItemList = GetSplitValueList(Item, TAB_SPLIT, 3)

             # different section should not mix in one section

             if self._SectionName != '' and self._SectionName != ItemList[0].upper():

                 EdkLogger.error('Parser', FORMAT_INVALID, "Different section names in the same section",

@@ -420,7 +420,7 @@ class MetaFileParser(object):
 

     ## Construct section Macro dict 

     def _ConstructSectionMacroDict(self, Name, Value):

-        ScopeKey = [(Scope[0], Scope[1],Scope[2]) for Scope in self._Scope]

+        ScopeKey = [(Scope[0], Scope[1], Scope[2]) for Scope in self._Scope]

         ScopeKey = tuple(ScopeKey)

         #

         # DecParser SectionType is a list, will contain more than one item only in Pcd Section

@@ -451,15 +451,15 @@ class MetaFileParser(object):
                 continue

 

             for ActiveScope in self._Scope:

-                Scope0, Scope1 ,Scope2= ActiveScope[0], ActiveScope[1],ActiveScope[2]

-                if(Scope0, Scope1,Scope2) not in Scope:

+                Scope0, Scope1, Scope2= ActiveScope[0], ActiveScope[1], ActiveScope[2]

+                if(Scope0, Scope1, Scope2) not in Scope:

                     break

             else:

                 SpeSpeMacroDict.update(self._SectionsMacroDict[(SectionType, Scope)])

 

             for ActiveScope in self._Scope:

-                Scope0, Scope1,Scope2 = ActiveScope[0], ActiveScope[1],ActiveScope[2]

-                if(Scope0, Scope1,Scope2) not in Scope and (Scope0, TAB_COMMON, TAB_COMMON) not in Scope and (TAB_COMMON, Scope1, TAB_COMMON) not in Scope:

+                Scope0, Scope1, Scope2 = ActiveScope[0], ActiveScope[1], ActiveScope[2]

+                if(Scope0, Scope1, Scope2) not in Scope and (Scope0, TAB_COMMON, TAB_COMMON) not in Scope and (TAB_COMMON, Scope1, TAB_COMMON) not in Scope:

                     break

             else:

                 ComSpeMacroDict.update(self._SectionsMacroDict[(SectionType, Scope)])

@@ -636,7 +636,7 @@ class InfParser(MetaFileParser):
             # Model, Value1, Value2, Value3, Arch, Platform, BelongsToItem=-1,

             # LineBegin=-1, ColumnBegin=-1, LineEnd=-1, ColumnEnd=-1, Enabled=-1

             #

-            for Arch, Platform,_ in self._Scope:

+            for Arch, Platform, _ in self._Scope:

                 LastItem = self._Store(self._SectionType,

                             self._ValueList[0],

                             self._ValueList[1],

@@ -947,7 +947,7 @@ class DscParser(MetaFileParser):
                 self._DirectiveParser()

                 continue

             if Line[0] == TAB_OPTION_START and not self._InSubsection:

-                EdkLogger.error("Parser", FILE_READ_FAILURE, "Missing the '{' before %s in Line %s" % (Line, Index+1),ExtraData=self.MetaFile)

+                EdkLogger.error("Parser", FILE_READ_FAILURE, "Missing the '{' before %s in Line %s" % (Line, Index+1), ExtraData=self.MetaFile)

 

             if self._InSubsection:

                 SectionType = self._SubsectionType

@@ -1104,7 +1104,7 @@ class DscParser(MetaFileParser):
     @ParseMacro

     def _SkuIdParser(self):

         TokenList = GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT)

-        if len(TokenList) not in (2,3):

+        if len(TokenList) not in (2, 3):

             EdkLogger.error('Parser', FORMAT_INVALID, "Correct format is '<Number>|<UiName>[|<UiName>]'",

                             ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)

         self._ValueList[0:len(TokenList)] = TokenList

@@ -1164,7 +1164,7 @@ class DscParser(MetaFileParser):
 

         # Validate the datum type of Dynamic Defaul PCD and DynamicEx Default PCD

         ValueList = GetSplitValueList(self._ValueList[2])

-        if len(ValueList) > 1 and ValueList[1] in [TAB_UINT8 , TAB_UINT16, TAB_UINT32 , TAB_UINT64] \

+        if len(ValueList) > 1 and ValueList[1] in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64] \

                               and self._ItemType in [MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_EX_DEFAULT]:

             EdkLogger.error('Parser', FORMAT_INVALID, "The datum type '%s' of PCD is wrong" % ValueList[1],

                             ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)

@@ -1172,7 +1172,7 @@ class DscParser(MetaFileParser):
         # Validate the VariableName of DynamicHii and DynamicExHii for PCD Entry must not be an empty string

         if self._ItemType in [MODEL_PCD_DYNAMIC_HII, MODEL_PCD_DYNAMIC_EX_HII]:

             DscPcdValueList = GetSplitValueList(TokenList[1], TAB_VALUE_SPLIT, 1)

-            if len(DscPcdValueList[0].replace('L','').replace('"','').strip()) == 0:

+            if len(DscPcdValueList[0].replace('L', '').replace('"', '').strip()) == 0:

                 EdkLogger.error('Parser', FORMAT_INVALID, "The VariableName field in the HII format PCD entry must not be an empty string",

                             ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)

 

@@ -1309,7 +1309,7 @@ class DscParser(MetaFileParser):
         self._ContentIndex = 0

         self._InSubsection = False

         while self._ContentIndex < len(self._Content) :

-            Id, self._ItemType, V1, V2, V3, S1, S2, S3,Owner, self._From, \

+            Id, self._ItemType, V1, V2, V3, S1, S2, S3, Owner, self._From, \

                 LineStart, ColStart, LineEnd, ColEnd, Enabled = self._Content[self._ContentIndex]

 

             if self._From < 0:

@@ -1327,8 +1327,8 @@ class DscParser(MetaFileParser):
                     break

                 Record = self._Content[self._ContentIndex]

                 if LineStart == Record[10] and LineEnd == Record[12]:

-                    if [Record[5], Record[6],Record[7]] not in self._Scope:

-                        self._Scope.append([Record[5], Record[6],Record[7]])

+                    if [Record[5], Record[6], Record[7]] not in self._Scope:

+                        self._Scope.append([Record[5], Record[6], Record[7]])

                     self._ContentIndex += 1

                 else:

                     break

@@ -1421,7 +1421,7 @@ class DscParser(MetaFileParser):
                         MODEL_PCD_DYNAMIC_VPD, MODEL_PCD_DYNAMIC_EX_DEFAULT, MODEL_PCD_DYNAMIC_EX_HII,

                         MODEL_PCD_DYNAMIC_EX_VPD):

             Records = self._RawTable.Query(PcdType, BelongsToItem= -1.0)

-            for TokenSpaceGuid, PcdName, Value, Dummy2, Dummy3, Dummy4,ID, Line in Records:

+            for TokenSpaceGuid, PcdName, Value, Dummy2, Dummy3, Dummy4, ID, Line in Records:

                 Name = TokenSpaceGuid + '.' + PcdName

                 if Name not in GlobalData.gPlatformOtherPcds:

                     PcdLine = Line

@@ -1800,7 +1800,7 @@ class DecParser(MetaFileParser):
         if self._DefinesCount > 1:

             EdkLogger.error('Parser', FORMAT_INVALID, 'Multiple [Defines] section is exist.', self.MetaFile )

         if self._DefinesCount == 0:

-            EdkLogger.error('Parser', FORMAT_INVALID, 'No [Defines] section exist.',self.MetaFile)

+            EdkLogger.error('Parser', FORMAT_INVALID, 'No [Defines] section exist.', self.MetaFile)

         self._Done()

 

 

@@ -1944,7 +1944,7 @@ class DecParser(MetaFileParser):
                     self._CurrentStructurePcdName = ""

                 else:

                     if self._CurrentStructurePcdName != TAB_SPLIT.join(PcdNames[:2]):

-                        EdkLogger.error('Parser', FORMAT_INVALID, "Pcd Name does not match: %s and %s " % (self._CurrentStructurePcdName , TAB_SPLIT.join(PcdNames[:2])),

+                        EdkLogger.error('Parser', FORMAT_INVALID, "Pcd Name does not match: %s and %s " % (self._CurrentStructurePcdName, TAB_SPLIT.join(PcdNames[:2])),

                                 File=self.MetaFile, Line=self._LineIndex + 1)

                     self._ValueList[1] = TAB_SPLIT.join(PcdNames[2:])

                     self._ValueList[2] = PcdTockens[1]

diff --git a/BaseTools/Source/Python/Workspace/MetaFileTable.py b/BaseTools/Source/Python/Workspace/MetaFileTable.py
index d17487a440..69b2c40e7f 100644
--- a/BaseTools/Source/Python/Workspace/MetaFileTable.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileTable.py
@@ -258,8 +258,8 @@ class PackageTable(MetaFileTable):
                 ValidType = "@ValidList"

             if oricomment.startswith("@Expression"):

                 ValidType = "@Expression"

-            EdkLogger.error('Parser', FORMAT_INVALID, "The syntax for %s of PCD %s.%s is incorrect" % (ValidType,TokenSpaceGuid, PcdCName),

-                            ExtraData=oricomment,File=self.MetaFile, Line=LineNum)

+            EdkLogger.error('Parser', FORMAT_INVALID, "The syntax for %s of PCD %s.%s is incorrect" % (ValidType, TokenSpaceGuid, PcdCName),

+                            ExtraData=oricomment, File=self.MetaFile, Line=LineNum)

             return set(), set(), set()

         return set(validateranges), set(validlists), set(expressions)

 ## Python class representation of table storing platform data

@@ -308,7 +308,7 @@ class PlatformTable(MetaFileTable):
     #

     def Insert(self, Model, Value1, Value2, Value3, Scope1=TAB_ARCH_COMMON, Scope2=TAB_COMMON, Scope3=TAB_DEFAULT_STORES_DEFAULT,BelongsToItem=-1,

                FromItem=-1, StartLine=-1, StartColumn=-1, EndLine=-1, EndColumn=-1, Enabled=1):

-        (Value1, Value2, Value3, Scope1, Scope2,Scope3) = ConvertToSqlString((Value1, Value2, Value3, Scope1, Scope2,Scope3))

+        (Value1, Value2, Value3, Scope1, Scope2, Scope3) = ConvertToSqlString((Value1, Value2, Value3, Scope1, Scope2, Scope3))

         return Table.Insert(

                         self, 

                         Model, 

diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
index 713c1ddbdd..e8f159b262 100644
--- a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
+++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
@@ -53,7 +53,7 @@ def GetPackageList(Platform, BuildDatabase, Arch, Target, Toolchain):
 #  @retval: A dictionary contains instances of PcdClassObject with key (PcdCName, TokenSpaceGuid)

 #  @retval: A dictionary contains real GUIDs of TokenSpaceGuid

 #

-def GetDeclaredPcd(Platform, BuildDatabase, Arch, Target, Toolchain,additionalPkgs):

+def GetDeclaredPcd(Platform, BuildDatabase, Arch, Target, Toolchain, additionalPkgs):

     PkgList = GetPackageList(Platform, BuildDatabase, Arch, Target, Toolchain)

     PkgList = set(PkgList)

     PkgList |= additionalPkgs