BaseTools: Clean some coding style issues

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

diff --git a/BaseTools/Source/Python/GenFds/Region.py b/BaseTools/Source/Python/GenFds/Region.py
index feb56cb60f27d962a0ecff6c88f2319d53f72d5e..01e998e54c6fb6c5fa2ec1aa5c4d0f8e47622c54 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Region.py
+++ b/BaseTools/Source/Python/GenFds/Region.py
@@ -54,10 +54,10 @@ class Region(RegionClassObject):
     #   @retval string      Generated FV file path\r
     #\r
 \r
-    def AddToBuffer(self, Buffer, BaseAddress, BlockSizeList, ErasePolarity, ImageBinDict, vtfDict = None, MacroDict = {}):\r
+    def AddToBuffer(self, Buffer, BaseAddress, BlockSizeList, ErasePolarity, ImageBinDict, vtfDict=None, MacroDict={}):\r
         Size = self.Size\r
         GenFdsGlobalVariable.InfLogger('\nGenerate Region at Offset 0x%X' % self.Offset)\r
-        GenFdsGlobalVariable.InfLogger("   Region Size = 0x%X" %Size)\r
+        GenFdsGlobalVariable.InfLogger("   Region Size = 0x%X" % Size)\r
         GenFdsGlobalVariable.SharpCounter = 0\r
 \r
         if self.RegionType == 'FV':\r
@@ -65,13 +65,13 @@ class Region(RegionClassObject):
             # Get Fv from FvDict\r
             #\r
             self.FvAddress = int(BaseAddress, 16) + self.Offset\r
-            FvBaseAddress  = '0x%X' %self.FvAddress\r
-            FvOffset       = 0\r
+            FvBaseAddress = '0x%X' % self.FvAddress\r
+            FvOffset = 0\r
             for RegionData in self.RegionDataList:\r
                 FileName = None\r
                 if RegionData.endswith(".fv"):\r
                     RegionData = GenFdsGlobalVariable.MacroExtend(RegionData, MacroDict)\r
-                    GenFdsGlobalVariable.InfLogger('   Region FV File Name = .fv : %s'%RegionData)\r
+                    GenFdsGlobalVariable.InfLogger('   Region FV File Name = .fv : %s' % RegionData)\r
                     if RegionData[1] != ':' :\r
                         RegionData = os.path.join (GenFdsGlobalVariable.WorkSpaceDir, RegionData)\r
                     if not os.path.exists(RegionData):\r
@@ -101,7 +101,7 @@ class Region(RegionClassObject):
                             EdkLogger.error("GenFds", GENFDS_ERROR,\r
                                             "FV (%s) is NOT %s Aligned!" % (FvObj.UiFvName, FvObj.FvAlignment))\r
                         FvBuffer = StringIO.StringIO('')\r
-                        FvBaseAddress = '0x%X' %self.FvAddress\r
+                        FvBaseAddress = '0x%X' % self.FvAddress\r
                         BlockSize = None\r
                         BlockNum = None\r
                         FvObj.AddToBuffer(FvBuffer, FvBaseAddress, BlockSize, BlockNum, ErasePolarity, vtfDict)\r
@@ -128,7 +128,7 @@ class Region(RegionClassObject):
                         EdkLogger.error("GenFds", GENFDS_ERROR,\r
                                         "Size of FV File (%s) is larger than Region Size 0x%X specified." \\r
                                         % (RegionData, Size))\r
-                    BinFile = open (FileName, 'r+b')\r
+                    BinFile = open(FileName, 'r+b')\r
                     Buffer.write(BinFile.read())\r
                     BinFile.close()\r
                     Size = Size - FileLength\r
@@ -150,7 +150,7 @@ class Region(RegionClassObject):
             for RegionData in self.RegionDataList:\r
                 if RegionData.endswith(".cap"):\r
                     RegionData = GenFdsGlobalVariable.MacroExtend(RegionData, MacroDict)\r
-                    GenFdsGlobalVariable.InfLogger('   Region CAPSULE Image Name = .cap : %s'%RegionData)\r
+                    GenFdsGlobalVariable.InfLogger('   Region CAPSULE Image Name = .cap : %s' % RegionData)\r
                     if RegionData[1] != ':' :\r
                         RegionData = os.path.join (GenFdsGlobalVariable.WorkSpaceDir, RegionData)\r
                     if not os.path.exists(RegionData):\r
@@ -187,7 +187,7 @@ class Region(RegionClassObject):
                     EdkLogger.error("GenFds", GENFDS_ERROR,\r
                                     "Size 0x%X of Capsule File (%s) is larger than Region Size 0x%X specified." \\r
                                     % (FileLength, RegionData, Size))\r
-                BinFile = open (FileName, 'r+b')\r
+                BinFile = open(FileName, 'r+b')\r
                 Buffer.write(BinFile.read())\r
                 BinFile.close()\r
                 Size = Size - FileLength\r
@@ -217,8 +217,8 @@ class Region(RegionClassObject):
                     EdkLogger.error("GenFds", GENFDS_ERROR,\r
                                     "Size of File (%s) is larger than Region Size 0x%X specified." \\r
                                     % (RegionData, Size))\r
-                GenFdsGlobalVariable.InfLogger('   Region File Name = %s'%RegionData)\r
-                BinFile = open (RegionData, 'rb')\r
+                GenFdsGlobalVariable.InfLogger('   Region File Name = %s' % RegionData)\r
+                BinFile = open(RegionData, 'rb')\r
                 Buffer.write(BinFile.read())\r
                 BinFile.close()\r
                 Size = Size - FileLength\r
@@ -273,17 +273,17 @@ class Region(RegionClassObject):
             Granu = 1024\r
             Str = Str[:-1]\r
         elif Str.endswith('M'):\r
-            Granu = 1024*1024\r
+            Granu = 1024 * 1024\r
             Str = Str[:-1]\r
         elif Str.endswith('G'):\r
-            Granu = 1024*1024*1024\r
+            Granu = 1024 * 1024 * 1024\r
             Str = Str[:-1]\r
         else:\r
             pass\r
 \r
-        AlignValue = int(Str)*Granu\r
+        AlignValue = int(Str) * Granu\r
         return AlignValue\r
- \r
+\r
     ## BlockSizeOfRegion()\r
     #\r
     #   @param  BlockSizeList        List of block information\r
@@ -304,7 +304,7 @@ class Region(RegionClassObject):
             else:\r
                 # region ended within current blocks\r
                 if self.Offset + self.Size <= End:\r
-                    ExpectedList.append((BlockSize, (RemindingSize + BlockSize - 1)/BlockSize))\r
+                    ExpectedList.append((BlockSize, (RemindingSize + BlockSize - 1) / BlockSize))\r
                     break\r
                 # region not ended yet\r
                 else:\r
@@ -313,11 +313,11 @@ class Region(RegionClassObject):
                         UsedBlockNum = BlockNum\r
                     # region started in middle of current blocks\r
                     else:\r
-                        UsedBlockNum = (End - self.Offset)/BlockSize\r
+                        UsedBlockNum = (End - self.Offset) / BlockSize\r
                     Start = End\r
                     ExpectedList.append((BlockSize, UsedBlockNum))\r
                     RemindingSize -= BlockSize * UsedBlockNum\r
-                   \r
+\r
         if FvObj.BlockSizeList == []:\r
             FvObj.BlockSizeList = ExpectedList\r
         else:\r
@@ -333,22 +333,22 @@ class Region(RegionClassObject):
                 Sum += Item[0] * Item[1]\r
             if self.Size < Sum:\r
                 EdkLogger.error("GenFds", GENFDS_ERROR, "Total Size of FV %s 0x%x is larger than Region Size 0x%x "\r
-                                %(FvObj.UiFvName, Sum, self.Size))\r
+                                % (FvObj.UiFvName, Sum, self.Size))\r
             # check whether the BlockStatements in FV section is appropriate\r
             ExpectedListData = ''\r
             for Item in ExpectedList:\r
-                ExpectedListData += "BlockSize = 0x%x\n\tNumBlocks = 0x%x\n\t"%Item \r
+                ExpectedListData += "BlockSize = 0x%x\n\tNumBlocks = 0x%x\n\t" % Item\r
             Index = 0\r
             for Item in FvObj.BlockSizeList:\r
                 if Item[0] != ExpectedList[Index][0]:\r
                     EdkLogger.error("GenFds", GENFDS_ERROR, "BlockStatements of FV %s are not align with FD's, suggested FV BlockStatement"\r
-                                    %FvObj.UiFvName, ExtraData = ExpectedListData)\r
+                                    % FvObj.UiFvName, ExtraData=ExpectedListData)\r
                 elif Item[1] != ExpectedList[Index][1]:\r
                     if (Item[1] < ExpectedList[Index][1]) and (Index == len(FvObj.BlockSizeList) - 1):\r
                         break;\r
                     else:\r
                         EdkLogger.error("GenFds", GENFDS_ERROR, "BlockStatements of FV %s are not align with FD's, suggested FV BlockStatement"\r
-                                        %FvObj.UiFvName, ExtraData = ExpectedListData)\r
+                                        % FvObj.UiFvName, ExtraData=ExpectedListData)\r
                 else:\r
                     Index += 1\r
 \r