BaseTools/UPT: Update the import statement to use StringUtils

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Parser / InfPcdSectionParser.py

diff --git a/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py b/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py
index 1011559450f8316806da0063f9bfccae85b8dcc3..13535a3738eabf9f115fbb724f69b2d954385c64 100644 (file)
--- a/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py
+++ b/BaseTools/Source/Python/UPT/Parser/InfPcdSectionParser.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file contained the parser for [Pcds] sections in INF file \r
 #\r
-# Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -26,7 +26,7 @@ from Library import DataType as DT
 from Library.Parsing import MacroParser\r
 from Library.Misc import GetSplitValueList\r
 from Library import GlobalData\r
-from Library.String import SplitPcdEntry\r
+from Library.StringUtils import SplitPcdEntry\r
 from Parser.InfParserMisc import InfParserSectionRoot\r
 \r
 class InfPcdSectionParser(InfParserSectionRoot):\r
@@ -95,7 +95,7 @@ class InfPcdSectionParser(InfParserSectionRoot):
                                               FileName,\r
                                               DT.MODEL_EFI_PCD,\r
                                               self.FileLocalMacros)\r
-                    if Name != None:\r
+                    if Name is not None:\r
                         SectionMacros[Name] = Value\r
                         ValueList = []\r
                         CommentsList = []\r
@@ -160,13 +160,13 @@ class InfPcdSectionParser(InfParserSectionRoot):
                                      ExtraData=LineContent)\r
                 #                    \r
                 elif KeysList[0][0].upper() == DT.TAB_INF_PCD_EX.upper():\r
-                    if len(TokenList) != 2:\r
+                    if len(TokenList) != 1:\r
                         Logger.Error('InfParser', \r
                                      FORMAT_INVALID, \r
                                      ST.ERR_ASBUILD_PCDEX_FORMAT_INVALID,\r
                                      File=FileName,\r
                                      Line=LineNo,\r
-                                     ExtraData=LineContent)                                         \r
+                                     ExtraData=LineContent)\r
                 ValueList[0:len(TokenList)] = TokenList\r
                 if len(ValueList) >= 1:                \r
                     PcdList.append((ValueList, CommentsList, (LineContent, LineNo, FileName)))                  \r