BaseTools: Clean some coding style issues

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / StrGather.py

diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Source/Python/AutoGen/StrGather.py
index b84d9f90aaec59e003d65fa3adb3252622c85714..60840041ba22ce2fc290808efc0ace05e615b6b0 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/StrGather.py
+++ b/BaseTools/Source/Python/AutoGen/StrGather.py
@@ -1,4 +1,8 @@
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+## @file\r
+# This file is used to parse a strings file and create or add to a string database \r
+# file.\r
+#\r
+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.  The full text of the license may be found at\r
@@ -7,10 +11,6 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
-#\r
-#This file is used to parse a strings file and create or add to a string database file.\r
-#\r
-\r
 ##\r
 # Import Modules\r
 #\r
@@ -20,6 +20,7 @@ from Common.BuildToolError import *
 from UniClassObject import *\r
 from StringIO import StringIO\r
 from struct import pack\r
+from Common.LongFilePathSupport import OpenLongFilePath as open\r
 \r
 ##\r
 # Static definitions\r
@@ -112,7 +113,7 @@ def DecToHexStr(Dec, Digit = 8):
 # @retval:       A list for formatted hex string\r
 #\r
 def DecToHexList(Dec, Digit = 8):\r
-    Hex = eval("'%0" + str(Digit) + "X' % int(Dec)" )\r
+    Hex = eval("'%0" + str(Digit) + "X' % int(Dec)")\r
     List = []\r
     for Bit in range(Digit - 2, -1, -2):\r
         List.append(HexHeader + Hex[Bit:Bit + 2])\r
@@ -191,7 +192,7 @@ def CreateHFileContent(BaseName, UniObjectClass, IsCompatibleMode, UniGenCFlag):
                     Line = COMMENT_DEFINE_STR + ' ' + Name + ' ' * (ValueStartPtr - len(DEFINE_STR + Name)) + DecToHexStr(Token, 4) + COMMENT_NOT_REFERENCED\r
                 UnusedStr = WriteLine(UnusedStr, Line)\r
 \r
-    Str = ''.join([Str,UnusedStr])\r
+    Str = ''.join([Str, UnusedStr])\r
 \r
     Str = WriteLine(Str, '')\r
     if IsCompatibleMode or UniGenCFlag:\r
@@ -234,7 +235,7 @@ def CreateCFileHeader():
 #\r
 def CreateBinBuffer(BinBuffer, Array):\r
     for Item in Array:\r
-        BinBuffer.write(pack("B", int(Item,16)))\r
+        BinBuffer.write(pack("B", int(Item, 16)))\r
 \r
 ## Create a formatted string all items in an array\r
 #\r
@@ -257,7 +258,7 @@ def CreateArrayItem(Array, Width = 16):
             Index = Index + 1\r
         else:\r
             ArrayItem = WriteLine(ArrayItem, Line)\r
-            Line = '  ' + Item +  ',  '\r
+            Line = '  ' + Item + ',  '\r
             Index = 1\r
     ArrayItem = Write(ArrayItem, Line.rstrip())\r
 \r
@@ -319,7 +320,7 @@ def GetFilteredLanguage(UniLanguageList, LanguageFilterList):
 \r
                 if PrimaryTag == UniLanguagePrimaryTag:\r
                     if UniLanguage not in UniLanguageListFiltered:\r
-                        UniLanguageListFiltered += [UniLanguage]    \r
+                        UniLanguageListFiltered += [UniLanguage]\r
                     break\r
             else:\r
                 # Here is rule 3 for "get best language"\r
@@ -367,7 +368,7 @@ def CreateCFileContent(BaseName, UniObjectClass, IsCompatibleMode, UniBinBuffer,
     \r
     UniLanguageList = []\r
     for IndexI in range(len(UniObjectClass.LanguageDef)):\r
-        UniLanguageList += [UniObjectClass.LanguageDef[IndexI][0]]           \r
+        UniLanguageList += [UniObjectClass.LanguageDef[IndexI][0]]\r
 \r
     UniLanguageListFiltered = GetFilteredLanguage(UniLanguageList, LanguageFilterList)\r
  \r
@@ -449,14 +450,14 @@ def CreateCFileContent(BaseName, UniObjectClass, IsCompatibleMode, UniBinBuffer,
         if UniBinBuffer:\r
             CreateBinBuffer (UniBinBuffer, List)\r
             UniBinBuffer.write (StringBuffer.getvalue())\r
-            UniBinBuffer.write (pack("B", int(EFI_HII_SIBT_END,16)))\r
+            UniBinBuffer.write (pack("B", int(EFI_HII_SIBT_END, 16)))\r
         StringBuffer.close()\r
 \r
     #\r
     # Create line for string variable name\r
     # "unsigned char $(BaseName)Strings[] = {"\r
     #\r
-    AllStr = WriteLine('', CHAR_ARRAY_DEFIN + ' ' + BaseName + COMMON_FILE_NAME + '[] = {\n' )\r
+    AllStr = WriteLine('', CHAR_ARRAY_DEFIN + ' ' + BaseName + COMMON_FILE_NAME + '[] = {\n')\r
 \r
     if IsCompatibleMode:\r
         #\r
@@ -617,13 +618,13 @@ def GetStringFiles(UniFilList, SourceFileList, IncludeList, IncludePathList, Ski
 # Write an item\r
 #\r
 def Write(Target, Item):\r
-    return ''.join([Target,Item])\r
+    return ''.join([Target, Item])\r
 \r
 #\r
 # Write an item with a break line\r
 #\r
 def WriteLine(Target, Item):\r
-    return ''.join([Target,Item,'\n'])\r
+    return ''.join([Target, Item, '\n'])\r
 \r
 # This acts like the main() function for the script, unless it is 'import'ed into another\r
 # script.\r