BaseTools: Rename String to StringUtils.

[mirror_edk2.git] / BaseTools / Source / Python / Ecc / MetaFileWorkspace / MetaFileParser.py

diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
index 34ab586084f1be04ff3bbc39b17280f741a2b37a..3749f6a2699e415ffed2063b826d2d9e0048e9e8 100644 (file)
--- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file is used to parse meta files\r
 #\r
-# Copyright (c) 2008 - 2015, 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
@@ -26,7 +26,7 @@ import EccToolError
 \r
 from CommonDataClass.DataClass import *\r
 from Common.DataType import *\r
-from Common.String import *\r
+from Common.StringUtils import *\r
 from Common.Misc import GuidStructureStringToGuidString, CheckPcdDatum, PathClass, AnalyzePcdData\r
 from Common.Expression import *\r
 from CommonDataClass.Exceptions import *\r
@@ -1433,7 +1433,7 @@ class DscParser(MetaFileParser):
         #\r
         # PCD value can be an expression\r
         #\r
-        if len(ValueList) > 1 and ValueList[1] == 'VOID*':\r
+        if len(ValueList) > 1 and ValueList[1] == TAB_VOID:\r
             PcdValue = ValueList[0]      \r
             try:\r
                 ValueList[0] = ValueExpression(PcdValue, self._Macros)(True)\r
@@ -1900,25 +1900,14 @@ class DecParser(MetaFileParser):
     }\r
 \r
 \r
-## FdfObject\r
-#\r
-# This class defined basic Fdf object which is used by inheriting\r
-# \r
-# @param object:       Inherited from object class\r
-#\r
-class FdfObject(object):\r
-    def __init__(self):\r
-        object.__init__()\r
-\r
 ## Fdf\r
 #\r
 # This class defined the structure used in Fdf object\r
 # \r
-# @param FdfObject:     Inherited from FdfObject class\r
 # @param Filename:      Input value for Ffilename of Fdf file, default is None\r
 # @param WorkspaceDir:  Input value for current workspace directory, default is None\r
 #\r
-class Fdf(FdfObject):\r
+class Fdf(object):\r
     def __init__(self, Filename = None, IsToDatabase = False, WorkspaceDir = None, Database = None):\r
         self.WorkspaceDir = WorkspaceDir\r
         self.IsToDatabase = IsToDatabase\r