BaseTools:change some incorrect parameter defaults

BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1858

for Dict={},There are pitfalls in the way this default parameter is set
and Dict is not used in functions, other functions have these two cases,
I will change some incorrect parameter defaults

This patch is going to fix this issue

Cc: Liming Gao <liming.gao@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

2 files changed, 10 insertions, 4 deletions

diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/Source/Python/Common/RangeExpression.py
index e9296e0..039d281 100644
--- a/BaseTools/Source/Python/Common/RangeExpression.py
+++ b/BaseTools/Source/Python/Common/RangeExpression.py
@@ -342,7 +342,9 @@ class RangeExpression(BaseExpression):
                 raise BadExpression(ERR_STRING_EXPR % Operator)

 

 

-    def __init__(self, Expression, PcdDataType, SymbolTable = {}):

+    def __init__(self, Expression, PcdDataType, SymbolTable = None):

+        if SymbolTable is None:

+            SymbolTable = {}

         super(RangeExpression, self).__init__(self, Expression, PcdDataType, SymbolTable)

         self._NoProcess = False

         if not isinstance(Expression, type('')):

diff --git a/BaseTools/Source/Python/Common/StringUtils.py b/BaseTools/Source/Python/Common/StringUtils.py
index 0febbc0..73dafa7 100644
--- a/BaseTools/Source/Python/Common/StringUtils.py
+++ b/BaseTools/Source/Python/Common/StringUtils.py
@@ -243,8 +243,10 @@ def SplitModuleType(Key):
 #

 # @retval NewList           A new string list whose macros are replaced

 #

-def ReplaceMacros(StringList, MacroDefinitions={}, SelfReplacement=False):

+def ReplaceMacros(StringList, MacroDefinitions=None, SelfReplacement=False):

     NewList = []

+    if MacroDefinitions is None:

+        MacroDefinitions = {}

     for String in StringList:

         if isinstance(String, type('')):

             NewList.append(ReplaceMacro(String, MacroDefinitions, SelfReplacement))

@@ -264,8 +266,10 @@ def ReplaceMacros(StringList, MacroDefinitions={}, SelfReplacement=False):
 #

 # @retval string            The string whose macros are replaced

 #

-def ReplaceMacro(String, MacroDefinitions={}, SelfReplacement=False, RaiseError=False):

+def ReplaceMacro(String, MacroDefinitions=None, SelfReplacement=False, RaiseError=False):

     LastString = String

+    if MacroDefinitions is None:

+        MacroDefinitions = {}

     while String and MacroDefinitions:

         MacroUsed = GlobalData.gMacroRefPattern.findall(String)

         # no macro found in String, stop replacing

@@ -298,7 +302,7 @@ def ReplaceMacro(String, MacroDefinitions={}, SelfReplacement=False, RaiseError=
 #

 # @retval Path Formatted path

 #

-def NormPath(Path, Defines={}):

+def NormPath(Path, Defines=None):

     IsRelativePath = False

     if Path:

         if Path[0] == '.':