BaseTools: Various typo

[mirror_edk2.git] / BaseTools / Source / Python / Common / Parsing.py

diff --git a/BaseTools/Source/Python/Common/Parsing.py b/BaseTools/Source/Python/Common/Parsing.py
index d199d1e40d8e0605de8fb8dd886e79908e8e68a6..d858501af6c10aa432d99f789963b271287d893a 100644 (file)
--- a/BaseTools/Source/Python/Common/Parsing.py
+++ b/BaseTools/Source/Python/Common/Parsing.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file is used to define common parsing related functions used in parsing INF/DEC/DSC process\r
 #\r
-# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2008 - 2018, 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
@@ -14,9 +14,10 @@
 ##\r
 # Import Modules\r
 #\r
-from String import *\r
+from __future__ import absolute_import\r
+from .StringUtils import *\r
 from CommonDataClass.DataClass import *\r
-from DataType import *\r
+from .DataType import *\r
 \r
 ## ParseDefineMacro\r
 #\r
@@ -35,18 +36,16 @@ def ParseDefineMacro2(Table, RecordSets, GlobalMacro):
         Macros[Record[0]] = Record[1]\r
 \r
     #\r
-    # Overrided by Global Macros\r
+    # Overridden by Global Macros\r
     #\r
-    for Key in GlobalMacro.keys():\r
-        Macros[Key] = GlobalMacro[Key]\r
+    Macros.update(GlobalMacro)\r
 \r
     #\r
     # Replace the Macros\r
     #\r
-    for Key in RecordSets.keys():\r
-        if RecordSets[Key] != []:\r
-            for Item in RecordSets[Key]:\r
-                Item[0] = ReplaceMacro(Item[0], Macros)\r
+    for Value in (v for v in RecordSets.values() if v):\r
+        for Item in Value:\r
+            Item[0] = ReplaceMacro(Item[0], Macros)\r
 \r
 ## ParseDefineMacro\r
 #\r
@@ -77,10 +76,9 @@ def ParseDefineMacro(Table, GlobalMacro):
         Macros[Record[0]] = Record[1]\r
 \r
     #\r
-    # Overrided by Global Macros\r
+    # Overridden by Global Macros\r
     #\r
-    for Key in GlobalMacro.keys():\r
-        Macros[Key] = GlobalMacro[Key]\r
+    Macros.update(GlobalMacro)\r
 \r
     #\r
     # Found all defined macro and replaced\r
@@ -832,7 +830,7 @@ def InsertSectionItems(Model, CurrentSection, SectionItemList, ArchList, ThirdLi
 # @param Table:            The Table to be inserted\r
 # @param FileID:           The ID of belonging file\r
 # @param Filename:         The name of belonging file\r
-# @param CurrentSection:   The name of currect section\r
+# @param CurrentSection:   The name of current section\r
 # @param SectionItemList:  A list of items of the section\r
 # @param ArchList:         A list of arches\r
 # @param ThirdList:        A list of third parameters, ModuleType for LibraryClass and SkuId for Dynamic Pcds\r