[edk2] [PATCH v1 4/4] BaseTools: cleanup class heirarchy

Jaben Carsey posted 4 patches 7 years, 3 months ago
[edk2] [PATCH v1 4/4] BaseTools: cleanup class heirarchy
Posted by Jaben Carsey 7 years, 3 months ago
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>
---
 BaseTools/Source/Python/Common/DecClassObject.py                | 13 +------------
 BaseTools/Source/Python/Common/DscClassObject.py                | 13 +------------
 BaseTools/Source/Python/Common/FdfClassObject.py                | 12 +-----------
 BaseTools/Source/Python/Common/InfClassObject.py                | 13 +------------
 BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py | 13 +------------
 5 files changed, 5 insertions(+), 59 deletions(-)

diff --git a/BaseTools/Source/Python/Common/DecClassObject.py b/BaseTools/Source/Python/Common/DecClassObject.py
index d7c70a7336a0..4d267f147f05 100644
--- a/BaseTools/Source/Python/Common/DecClassObject.py
+++ b/BaseTools/Source/Python/Common/DecClassObject.py
@@ -48,21 +48,10 @@ Section = {TAB_UNKNOWN.upper() : MODEL_UNKNOWN,
            }
 
 
-## DecObject
-#
-# This class defined basic Dec object which is used by inheriting
-# 
-# @param object:       Inherited from object class
-#
-class DecObject(object):
-    def __init__(self):
-        object.__init__()
-
 ## Dec
 #
 # This class defined the structure used in Dec object
 # 
-# @param DecObject:         Inherited from DecObject class
 # @param Filename:          Input value for Filename of Dec file, default is None
 # @param IsMergeAllArches:  Input value for IsMergeAllArches
 #                           True is to merge all arches
@@ -82,7 +71,7 @@ class DecObject(object):
 # @var Contents:            To store value for Contents, it is a structure as DecContents
 # @var KeyList:             To store value for KeyList, a list for all Keys used in Dec
 #
-class Dec(DecObject):
+class Dec(object):
     def __init__(self, Filename=None, IsToDatabase=False, IsToPackage=False, WorkspaceDir=None, Database=None, SupArchList=DataType.ARCH_LIST):
         self.Identification = Identification()
         self.Package = PackageClass()
diff --git a/BaseTools/Source/Python/Common/DscClassObject.py b/BaseTools/Source/Python/Common/DscClassObject.py
index c2fa1c275a2d..d14b6a718522 100644
--- 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
            }
 
-## DscObject
-#
-# This class defined basic Dsc object which is used by inheriting
-#
-# @param object:       Inherited from object class
-#
-class DscObject(object):
-    def __init__(self):
-        object.__init__()
-
 ## Dsc
 #
 # This class defined the structure used in Dsc object
 #
-# @param DscObject:         Inherited from InfObject class
 # @param Ffilename:         Input value for Ffilename of Inf file, default is None
 # @param IsMergeAllArches:  Input value for IsMergeAllArches
 #                           True is to merge all arches
@@ -89,7 +78,7 @@ class DscObject(object):
 # @var WorkspaceDir:        To store value for WorkspaceDir
 # @var KeyList:             To store value for KeyList, a list for all Keys used in Dec
 #
-class Dsc(DscObject):
+class Dsc(object):
     _NullClassIndex = 0
 
     def __init__(self, Filename=None, IsToDatabase=False, IsToPlatform=False, WorkspaceDir=None, Database=None):
diff --git a/BaseTools/Source/Python/Common/FdfClassObject.py b/BaseTools/Source/Python/Common/FdfClassObject.py
index 3e7d44954c88..b3b45f634ed8 100644
--- 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
 from String import NormPath
 
-## FdfObject
-#
-# This class defined basic Fdf object which is used by inheriting
-# 
-# @param object:       Inherited from object class
-#
-class FdfObject(object):
-    def __init__(self):
-        object.__init__()
 
 ## Fdf
 #
 # This class defined the structure used in Fdf object
 # 
-# @param FdfObject:     Inherited from FdfObject class
 # @param Filename:      Input value for Ffilename of Fdf file, default is None
 # @param WorkspaceDir:  Input value for current workspace directory, default is None
 #
-class Fdf(FdfObject):
+class Fdf(object):
     def __init__(self, Filename = None, IsToDatabase = False, WorkspaceDir = None, Database = None):
         self.WorkspaceDir = WorkspaceDir
         self.IsToDatabase = IsToDatabase
diff --git a/BaseTools/Source/Python/Common/InfClassObject.py b/BaseTools/Source/Python/Common/InfClassObject.py
index f24e4e41a0c1..89e110ea5e7a 100644
--- 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):
         return key in self._Mapping_
 
-## InfObject
-#
-# This class defined basic Inf object which is used by inheriting
-#
-# @param object:       Inherited from object class
-#
-class InfObject(object):
-    def __init__(self):
-        object.__init__()
-
 ## Inf
 #
 # This class defined the structure used in Inf object
 #
-# @param InfObject:         Inherited from InfObject class
 # @param Ffilename:         Input value for Ffilename of Inf file, default is None
 # @param IsMergeAllArches:  Input value for IsMergeAllArches
 #                           True is to merge all arches
@@ -163,7 +152,7 @@ class InfObject(object):
 # @var WorkspaceDir:        To store value for WorkspaceDir
 # @var KeyList:             To store value for KeyList, a list for all Keys used in Inf
 #
-class Inf(InfObject):
+class Inf(object):
     def __init__(self, Filename=None, IsToDatabase=False, IsToModule=False, WorkspaceDir=None, Database=None, SupArchList=DataType.ARCH_LIST):
         self.Identification = Identification()
         self.Module = ModuleClass()
diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
index ba478f9ecf10..b60e8f50e4f2 100644
--- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
@@ -1900,25 +1900,14 @@ class DecParser(MetaFileParser):
     }
 
 
-## FdfObject
-#
-# This class defined basic Fdf object which is used by inheriting
-# 
-# @param object:       Inherited from object class
-#
-class FdfObject(object):
-    def __init__(self):
-        object.__init__()
-
 ## Fdf
 #
 # This class defined the structure used in Fdf object
 # 
-# @param FdfObject:     Inherited from FdfObject class
 # @param Filename:      Input value for Ffilename of Fdf file, default is None
 # @param WorkspaceDir:  Input value for current workspace directory, default is None
 #
-class Fdf(FdfObject):
+class Fdf(object):
     def __init__(self, Filename = None, IsToDatabase = False, WorkspaceDir = None, Database = None):
         self.WorkspaceDir = WorkspaceDir
         self.IsToDatabase = IsToDatabase
-- 
2.16.2.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel