diff options
author | Fan, ZhijuX <zhijux.fan@intel.com> | 2019-09-12 16:18:27 +0800 |
---|---|---|
committer | Feng, Bob C <bob.c.feng@intel.com> | 2019-09-17 10:18:51 +0800 |
commit | e32f7bc96dc8db7af0c1c532e4990c9a36a12354 (patch) | |
tree | 501408aa16702eec58fdebdee5c845317c5f9089 /BaseTools/Source/Python/Common/StringUtils.py | |
parent | b67735a7e8e962b74120bad956d9a0734f784472 (diff) | |
download | edk2-e32f7bc96dc8db7af0c1c532e4990c9a36a12354.tar.gz edk2-e32f7bc96dc8db7af0c1c532e4990c9a36a12354.tar.bz2 edk2-e32f7bc96dc8db7af0c1c532e4990c9a36a12354.zip |
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>
Diffstat (limited to 'BaseTools/Source/Python/Common/StringUtils.py')
-rw-r--r-- | BaseTools/Source/Python/Common/StringUtils.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/BaseTools/Source/Python/Common/StringUtils.py b/BaseTools/Source/Python/Common/StringUtils.py index 0febbc0034..73dafa797a 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] == '.':
|