BaseTools: cleanup class heirarchy

remove totally empty classes from class heirarchy

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

diff --git a/BaseTools/Source/Python/Common/DecClassObject.py b/BaseTools/Source/Python/Common/DecClassObject.py
index 835dbd5935d2e207a7e419390eaaa905f2c9fa1b..ed998d3b677d0f5f5118a856c61ef2bbd1a8fcb3 100644 (file)
--- a/BaseTools/Source/Python/Common/DecClassObject.py
+++ b/BaseTools/Source/Python/Common/DecClassObject.py
@@ -48,21 +48,10 @@ Section = {TAB_UNKNOWN.upper() : MODEL_UNKNOWN,
            }\r
 \r
 \r
-## DecObject\r
-#\r
-# This class defined basic Dec object which is used by inheriting\r
-# \r
-# @param object:       Inherited from object class\r
-#\r
-class DecObject(object):\r
-    def __init__(self):\r
-        object.__init__()\r
-\r
 ## Dec\r
 #\r
 # This class defined the structure used in Dec object\r
 # \r
-# @param DecObject:         Inherited from DecObject class\r
 # @param Filename:          Input value for Filename of Dec file, default is None\r
 # @param IsMergeAllArches:  Input value for IsMergeAllArches\r
 #                           True is to merge all arches\r
@@ -82,7 +71,7 @@ class DecObject(object):
 # @var Contents:            To store value for Contents, it is a structure as DecContents\r
 # @var KeyList:             To store value for KeyList, a list for all Keys used in Dec\r
 #\r
-class Dec(DecObject):\r
+class Dec(object):\r
     def __init__(self, Filename=None, IsToDatabase=False, IsToPackage=False, WorkspaceDir=None, Database=None, SupArchList=DataType.ARCH_LIST):\r
         self.Identification = Identification()\r
         self.Package = PackageClass()\r

diff --git a/BaseTools/Source/Python/Common/DscClassObject.py b/BaseTools/Source/Python/Common/DscClassObject.py
index b98dbf57229b9480978a20ca6a0ad92eb8af6440..da3101ae0fe9b70d44af6c1904103d3ae6ad2f30 100644 (file)
--- a/BaseTools/Source/Python/Common/DscClassObject.py
+++ b/BaseTools/Source/Python/Common/DscClassObject.py
@@ -54,21 +54,10 @@ Section = {TAB_UNKNOWN.upper() : MODEL_UNKNOWN,
            TAB_USER_EXTENSIONS.upper() : MODEL_META_DATA_USER_EXTENSION\r
            }\r
 \r
-## DscObject\r
-#\r
-# This class defined basic Dsc object which is used by inheriting\r
-#\r
-# @param object:       Inherited from object class\r
-#\r
-class DscObject(object):\r
-    def __init__(self):\r
-        object.__init__()\r
-\r
 ## Dsc\r
 #\r
 # This class defined the structure used in Dsc object\r
 #\r
-# @param DscObject:         Inherited from InfObject class\r
 # @param Ffilename:         Input value for Ffilename of Inf file, default is None\r
 # @param IsMergeAllArches:  Input value for IsMergeAllArches\r
 #                           True is to merge all arches\r
@@ -89,7 +78,7 @@ class DscObject(object):
 # @var WorkspaceDir:        To store value for WorkspaceDir\r
 # @var KeyList:             To store value for KeyList, a list for all Keys used in Dec\r
 #\r
-class Dsc(DscObject):\r
+class Dsc(object):\r
     _NullClassIndex = 0\r
 \r
     def __init__(self, Filename=None, IsToDatabase=False, IsToPlatform=False, WorkspaceDir=None, Database=None):\r

diff --git a/BaseTools/Source/Python/Common/FdfClassObject.py b/BaseTools/Source/Python/Common/FdfClassObject.py
index 3d37800d9ab78905ead4f5d166dfbfe1fa904634..9a7d6494d331e61d8a8d8740306ea7834f4f7cb4 100644 (file)
--- a/BaseTools/Source/Python/Common/FdfClassObject.py
+++ b/BaseTools/Source/Python/Common/FdfClassObject.py
@@ -19,25 +19,15 @@ from Table.TableFdf import TableFdf
 from CommonDataClass.DataClass import MODEL_FILE_FDF, MODEL_PCD, MODEL_META_DATA_COMPONENT\r
 from String import NormPath\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

diff --git a/BaseTools/Source/Python/Common/InfClassObject.py b/BaseTools/Source/Python/Common/InfClassObject.py
index ba43eb5484714978cb99faa01ec6d75a32bce6e9..7a5ba4eb84cedca5033a862f5eccc9a001a8efa7 100644 (file)
--- a/BaseTools/Source/Python/Common/InfClassObject.py
+++ b/BaseTools/Source/Python/Common/InfClassObject.py
@@ -131,21 +131,10 @@ class InfHeader(ModuleHeaderClass):
     def __contains__(self, key):\r
         return key in self._Mapping_\r
 \r
-## InfObject\r
-#\r
-# This class defined basic Inf object which is used by inheriting\r
-#\r
-# @param object:       Inherited from object class\r
-#\r
-class InfObject(object):\r
-    def __init__(self):\r
-        object.__init__()\r
-\r
 ## Inf\r
 #\r
 # This class defined the structure used in Inf object\r
 #\r
-# @param InfObject:         Inherited from InfObject class\r
 # @param Ffilename:         Input value for Ffilename of Inf file, default is None\r
 # @param IsMergeAllArches:  Input value for IsMergeAllArches\r
 #                           True is to merge all arches\r
@@ -163,7 +152,7 @@ class InfObject(object):
 # @var WorkspaceDir:        To store value for WorkspaceDir\r
 # @var KeyList:             To store value for KeyList, a list for all Keys used in Inf\r
 #\r
-class Inf(InfObject):\r
+class Inf(object):\r
     def __init__(self, Filename=None, IsToDatabase=False, IsToModule=False, WorkspaceDir=None, Database=None, SupArchList=DataType.ARCH_LIST):\r
         self.Identification = Identification()\r
         self.Module = ModuleClass()\r

diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
index 34ab586084f1be04ff3bbc39b17280f741a2b37a..237cf5acfea13ad0210cf3edda189e1b8d2fbe9f 100644 (file)
--- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
@@ -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