BaseTools: Clean some coding style issues

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / GuidSection.py

diff --git a/BaseTools/Source/Python/GenFds/GuidSection.py b/BaseTools/Source/Python/GenFds/GuidSection.py
index 006cf0f2169bb7ce2ea754fcc0a769d081c8bb2d..cc0c05a28c1e275c987a3f80e5f230ed67185d93 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GuidSection.py
+++ b/BaseTools/Source/Python/GenFds/GuidSection.py
@@ -53,7 +53,7 @@ class GuidSection(GuidSectionClassObject) :
     #   @param  Dict        dictionary contains macro and its value\r
     #   @retval tuple       (Generated file name, section alignment)\r
     #\r
-    def GenSection(self, OutputPath, ModuleName, SecNum, KeyStringList, FfsInf = None, Dict = {}):\r
+    def GenSection(self, OutputPath, ModuleName, SecNum, KeyStringList, FfsInf=None, Dict={}):\r
         #\r
         # Generate all section\r
         #\r
@@ -65,7 +65,7 @@ class GuidSection(GuidSectionClassObject) :
             self.SectionType = FfsInf.__ExtendMacro__(self.SectionType)\r
             self.CurrentArchList = [FfsInf.CurrentArch]\r
 \r
-        SectFile  = tuple()\r
+        SectFile = tuple()\r
         SectAlign = []\r
         Index = 0\r
         MaxAlign = None\r
@@ -84,7 +84,7 @@ class GuidSection(GuidSectionClassObject) :
 \r
         for Sect in self.SectionList:\r
             Index = Index + 1\r
-            SecIndex = '%s.%d' %(SecNum,Index)\r
+            SecIndex = '%s.%d' % (SecNum, Index)\r
             # set base address for inside FvImage\r
             if isinstance(Sect, FvImageSection):\r
                 if self.FvAddr != []:\r
@@ -93,7 +93,7 @@ class GuidSection(GuidSectionClassObject) :
             elif isinstance(Sect, GuidSection):\r
                 Sect.FvAddr = self.FvAddr\r
                 Sect.FvParentAddr = self.FvParentAddr\r
-            ReturnSectList, align = Sect.GenSection(OutputPath, ModuleName, SecIndex, KeyStringList,FfsInf, Dict)\r
+            ReturnSectList, align = Sect.GenSection(OutputPath, ModuleName, SecIndex, KeyStringList, FfsInf, Dict)\r
             if isinstance(Sect, GuidSection):\r
                 if Sect.IncludeFvSection:\r
                     self.IncludeFvSection = Sect.IncludeFvSection\r
@@ -118,10 +118,10 @@ class GuidSection(GuidSectionClassObject) :
                     self.Alignment = MaxAlign\r
 \r
         OutputFile = OutputPath + \\r
-                     os.sep     + \\r
+                     os.sep + \\r
                      ModuleName + \\r
-                     'SEC'      + \\r
-                     SecNum     + \\r
+                     'SEC' + \\r
+                     SecNum + \\r
                      Ffs.SectionSuffix['GUIDED']\r
         OutputFile = os.path.normpath(OutputFile)\r
 \r
@@ -135,7 +135,7 @@ class GuidSection(GuidSectionClassObject) :
         # GENCRC32 section\r
         #\r
         if self.NameGuid == None :\r
-            GenFdsGlobalVariable.VerboseLogger( "Use GenSection function Generate CRC32 Section")\r
+            GenFdsGlobalVariable.VerboseLogger("Use GenSection function Generate CRC32 Section")\r
             GenFdsGlobalVariable.GenerateSection(OutputFile, SectFile, Section.Section.SectionType[self.SectionType], InputAlign=SectAlign)\r
             OutputFileList = []\r
             OutputFileList.append(OutputFile)\r
@@ -144,7 +144,7 @@ class GuidSection(GuidSectionClassObject) :
         elif ExternalTool == None:\r
             EdkLogger.error("GenFds", GENFDS_ERROR, "No tool found with GUID %s" % self.NameGuid)\r
         else:\r
-            DummyFile = OutputFile+".dummy"\r
+            DummyFile = OutputFile + ".dummy"\r
             #\r
             # Call GenSection with DUMMY section type.\r
             #\r
@@ -153,10 +153,10 @@ class GuidSection(GuidSectionClassObject) :
             # Use external tool process the Output\r
             #\r
             TempFile = OutputPath + \\r
-                       os.sep     + \\r
+                       os.sep + \\r
                        ModuleName + \\r
-                       'SEC'      + \\r
-                       SecNum     + \\r
+                       'SEC' + \\r
+                       SecNum + \\r
                        '.tmp'\r
             TempFile = os.path.normpath(TempFile)\r
             #\r
@@ -197,12 +197,12 @@ class GuidSection(GuidSectionClassObject) :
             if not os.path.exists(TempFile):\r
                 EdkLogger.error("GenFds", COMMAND_FAILURE, 'Fail to call %s, no output file was generated' % ExternalTool)\r
 \r
-            FileHandleIn = open(DummyFile,'rb')\r
-            FileHandleIn.seek(0,2)\r
+            FileHandleIn = open(DummyFile, 'rb')\r
+            FileHandleIn.seek(0, 2)\r
             InputFileSize = FileHandleIn.tell()\r
-            \r
-            FileHandleOut = open(TempFile,'rb')\r
-            FileHandleOut.seek(0,2)\r
+\r
+            FileHandleOut = open(TempFile, 'rb')\r
+            FileHandleOut.seek(0, 2)\r
             TempFileSize = FileHandleOut.tell()\r
 \r
             Attribute = []\r
@@ -213,7 +213,7 @@ class GuidSection(GuidSectionClassObject) :
             if self.ProcessRequired == "NONE" and HeaderLength == None:\r
                 if TempFileSize > InputFileSize:\r
                     FileHandleIn.seek(0)\r
-                    BufferIn  = FileHandleIn.read()\r
+                    BufferIn = FileHandleIn.read()\r
                     FileHandleOut.seek(0)\r
                     BufferOut = FileHandleOut.read()\r
                     if BufferIn == BufferOut[TempFileSize - InputFileSize:]:\r
@@ -224,18 +224,18 @@ class GuidSection(GuidSectionClassObject) :
 \r
             FileHandleIn.close()\r
             FileHandleOut.close()\r
-            \r
+\r
             if FirstCall and 'PROCESSING_REQUIRED' in Attribute:\r
                 # Guided data by -z option on first call is the process required data. Call the guided tool with the real option.\r
                 GenFdsGlobalVariable.GuidTool(TempFile, [DummyFile], ExternalTool, CmdOption)\r
-            \r
+\r
             #\r
             # Call Gensection Add Section Header\r
             #\r
             if self.ProcessRequired in ("TRUE", "1"):\r
                 if 'PROCESSING_REQUIRED' not in Attribute:\r
                     Attribute.append('PROCESSING_REQUIRED')\r
-  \r
+\r
             if self.AuthStatusValid in ("TRUE", "1"):\r
                 Attribute.append('AUTH_STATUS_VALID')\r
             GenFdsGlobalVariable.GenerateSection(OutputFile, [TempFile], Section.Section.SectionType['GUIDED'],\r
@@ -263,7 +263,7 @@ class GuidSection(GuidSectionClassObject) :
             ToolDb = ToolDefClassObject.ToolDefDict(GenFdsGlobalVariable.ConfDir).ToolsDefTxtDatabase\r
             if ToolChain not in ToolDb['TOOL_CHAIN_TAG']:\r
                 EdkLogger.error("GenFds", GENFDS_ERROR, "Can not find external tool because tool tag %s is not defined in tools_def.txt!" % ToolChain)\r
-            self.KeyStringList = [Target+'_'+ToolChain+'_'+self.CurrentArchList[0]]\r
+            self.KeyStringList = [Target + '_' + ToolChain + '_' + self.CurrentArchList[0]]\r
             for Arch in self.CurrentArchList:\r
                 if Target + '_' + ToolChain + '_' + Arch not in self.KeyStringList:\r
                     self.KeyStringList.append(Target + '_' + ToolChain + '_' + Arch)\r
@@ -275,30 +275,30 @@ class GuidSection(GuidSectionClassObject) :
             if self.NameGuid == ToolDef[1]:\r
                 KeyList = ToolDef[0].split('_')\r
                 Key = KeyList[0] + \\r
-                      '_'        + \\r
+                      '_' + \\r
                       KeyList[1] + \\r
-                      '_'        + \\r
+                      '_' + \\r
                       KeyList[2]\r
                 if Key in self.KeyStringList and KeyList[4] == 'GUID':\r
 \r
-                    ToolPath = ToolDefinition.get( Key        + \\r
-                                                   '_'        + \\r
+                    ToolPath = ToolDefinition.get(Key + \\r
+                                                   '_' + \\r
                                                    KeyList[3] + \\r
-                                                   '_'        + \\r
+                                                   '_' + \\r
                                                    'PATH')\r
 \r
-                    ToolOption = ToolDefinition.get( Key        + \\r
-                                                    '_'        + \\r
+                    ToolOption = ToolDefinition.get(Key + \\r
+                                                    '_' + \\r
                                                     KeyList[3] + \\r
-                                                    '_'        + \\r
+                                                    '_' + \\r
                                                     'FLAGS')\r
                     if ToolPathTmp == None:\r
                         ToolPathTmp = ToolPath\r
                     else:\r
                         if ToolPathTmp != ToolPath:\r
                             EdkLogger.error("GenFds", GENFDS_ERROR, "Don't know which tool to use, %s or %s ?" % (ToolPathTmp, ToolPath))\r
-                            \r
-                    \r
+\r
+\r
         return ToolPathTmp, ToolOption\r
 \r
 \r