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>

1 files changed, 13 insertions, 13 deletions

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 6b4f724f6d..74785e0a93 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -1820,7 +1820,7 @@ class FdfParser:
             return long(

                 ValueExpression(Expr,

                                 self.__CollectMacroPcd()

-                                )(True),0)

+                                )(True), 0)

         except Exception:

             self.SetFileBufferPos(StartPos)

             return None

@@ -2730,7 +2730,7 @@ class FdfParser:
         while True:

             AlignValue = None

             if self.__GetAlignment():

-                if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+                if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",

                                         "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                     raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

                 #For FFS, Auto is default option same to ""

@@ -2789,7 +2789,7 @@ class FdfParser:
             FfsFileObj.CheckSum = True

 

         if self.__GetAlignment():

-            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",

                                     "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                 raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

             #For FFS, Auto is default option same to ""

@@ -2861,7 +2861,7 @@ class FdfParser:
 

         AlignValue = None

         if self.__GetAlignment():

-            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",

                                     "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                 raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

             AlignValue = self.__Token

@@ -3151,7 +3151,7 @@ class FdfParser:
 

         AlignValue = None

         if self.__GetAlignment():

-            if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+            if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",

                                     "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                 raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

             AlignValue = self.__Token

@@ -3544,7 +3544,7 @@ class FdfParser:
         AfileName = self.__Token

         AfileBaseName = os.path.basename(AfileName)

         

-        if os.path.splitext(AfileBaseName)[1]  not in [".bin",".BIN",".Bin",".dat",".DAT",".Dat",".data",".DATA",".Data"]:

+        if os.path.splitext(AfileBaseName)[1]  not in [".bin", ".BIN", ".Bin", ".dat", ".DAT", ".Dat", ".data", ".DATA", ".Data"]:

             raise Warning('invalid binary file type, should be one of "bin",BINARY_FILE_TYPE_BIN,"Bin","dat","DAT","Dat","data","DATA","Data"', \

                           self.FileName, self.CurrentLineNumber)

         

@@ -3741,7 +3741,7 @@ class FdfParser:
 

         AlignValue = ""

         if self.__GetAlignment():

-            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",

                                     "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                 raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

             #For FFS, Auto is default option same to ""

@@ -3791,7 +3791,7 @@ class FdfParser:
 

             SectAlignment = ""

             if self.__GetAlignment():

-                if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+                if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",

                                         "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                     raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

                 if self.__Token == 'Auto' and (not SectionName == BINARY_FILE_TYPE_PE32) and (not SectionName == BINARY_FILE_TYPE_TE):

@@ -3871,7 +3871,7 @@ class FdfParser:
                 FvImageSectionObj.FvFileType = self.__Token

 

                 if self.__GetAlignment():

-                    if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+                    if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",

                                             "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                         raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

                     FvImageSectionObj.Alignment = self.__Token

@@ -3939,7 +3939,7 @@ class FdfParser:
                 EfiSectionObj.BuildNum = self.__Token

 

         if self.__GetAlignment():

-            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",

+            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",

                                     "256K", "512K", "1M", "2M", "4M", "8M", "16M"):

                 raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

             if self.__Token == 'Auto' and (not SectionName == BINARY_FILE_TYPE_PE32) and (not SectionName == BINARY_FILE_TYPE_TE):

@@ -4679,7 +4679,7 @@ class FdfParser:
                     FvInFdList = self.__GetFvInFd(RefFdName)

                     if FvInFdList != []:

                         for FvNameInFd in FvInFdList:

-                            LogStr += "FD %s contains FV %s\n" % (RefFdName,FvNameInFd)

+                            LogStr += "FD %s contains FV %s\n" % (RefFdName, FvNameInFd)

                             if FvNameInFd not in RefFvStack:

                                 RefFvStack.append(FvNameInFd)

 

@@ -4735,7 +4735,7 @@ class FdfParser:
                         CapInFdList = self.__GetCapInFd(RefFdName)

                         if CapInFdList != []:

                             for CapNameInFd in CapInFdList:

-                                LogStr += "FD %s contains Capsule %s\n" % (RefFdName,CapNameInFd)

+                                LogStr += "FD %s contains Capsule %s\n" % (RefFdName, CapNameInFd)

                                 if CapNameInFd not in RefCapStack:

                                     RefCapStack.append(CapNameInFd)

 

@@ -4746,7 +4746,7 @@ class FdfParser:
                         FvInFdList = self.__GetFvInFd(RefFdName)

                         if FvInFdList != []:

                             for FvNameInFd in FvInFdList:

-                                LogStr += "FD %s contains FV %s\n" % (RefFdName,FvNameInFd)

+                                LogStr += "FD %s contains FV %s\n" % (RefFdName, FvNameInFd)

                                 if FvNameInFd not in RefFvList:

                                     RefFvList.append(FvNameInFd)