BaseTools: remove the super() function argument

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index b0aa4838e9617427f87103ea190f630329f1c07b..2815091de84cf3e75f6a6316516b2d02e560600b 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -198,11 +198,11 @@ class AutoGen(object):
             # if it exists, just return it directly\r
             return cls.__ObjectCache[Key]\r
             # it didnt exist. create it, cache it, then return it\r
-        RetVal = cls.__ObjectCache[Key] = super(AutoGen, cls).__new__(cls)\r
+        RetVal = cls.__ObjectCache[Key] = super().__new__(cls)\r
         return RetVal\r
 \r
     def __init__ (self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs):\r
-        super(AutoGen, self).__init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
+        super().__init__()\r
 \r
     ## hash() operator\r
     #\r
@@ -235,7 +235,7 @@ class WorkspaceAutoGen(AutoGen):
     # call super().__init__ then call the worker function with different parameter count\r
     def __init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs):\r
         if not hasattr(self, "_Init"):\r
-            super(WorkspaceAutoGen, self).__init__(Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
+            super().__init__(Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
             self._InitWorker(Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
             self._Init = True\r
 \r
@@ -973,7 +973,7 @@ class PlatformAutoGen(AutoGen):
     # call super().__init__ then call the worker function with different parameter count\r
     def __init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs):\r
         if not hasattr(self, "_Init"):\r
-            super(PlatformAutoGen, self).__init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
+            super().__init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
             self._InitWorker(Workspace, MetaFile, Target, Toolchain, Arch)\r
             self._Init = True\r
     #\r
@@ -2425,7 +2425,7 @@ class ModuleAutoGen(AutoGen):
     # call super().__init__ then call the worker function with different parameter count\r
     def __init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs):\r
         if not hasattr(self, "_Init"):\r
-            super(ModuleAutoGen, self).__init__(Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
+            super().__init__(Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
             self._InitWorker(Workspace, MetaFile, Target, Toolchain, Arch, *args)\r
             self._Init = True\r
 \r
@@ -2439,7 +2439,7 @@ class ModuleAutoGen(AutoGen):
             EdkLogger.verbose("Module [%s] for [%s] is not employed by active platform\n" \\r
                               % (MetaFile, Arch))\r
             return None\r
-        return super(ModuleAutoGen, cls).__new__(cls, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
+        return super().__new__(cls, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
 \r
     ## Initialize ModuleAutoGen\r
     #\r

diff --git a/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py b/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py
index 6ddf38fd0d8a405edd4016bb7c9c88a0f229aacc..379d404c762b4d9ee4ca34d0e86b1ec34d103871 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py
+++ b/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py
@@ -241,7 +241,7 @@ class VAR_CHECK_PCD_VALID_OBJ(object):
 \r
 class VAR_CHECK_PCD_VALID_LIST(VAR_CHECK_PCD_VALID_OBJ):\r
     def __init__(self, VarOffset, validlist, PcdDataType):\r
-        super(VAR_CHECK_PCD_VALID_LIST, self).__init__(VarOffset, validlist, PcdDataType)\r
+        super().__init__(VarOffset, validlist, PcdDataType)\r
         self.Type = 1\r
         valid_num_list = []\r
         for item in self.rawdata:\r
@@ -261,7 +261,7 @@ class VAR_CHECK_PCD_VALID_LIST(VAR_CHECK_PCD_VALID_OBJ):
 \r
 class VAR_CHECK_PCD_VALID_RANGE(VAR_CHECK_PCD_VALID_OBJ):\r
     def __init__(self, VarOffset, validrange, PcdDataType):\r
-        super(VAR_CHECK_PCD_VALID_RANGE, self).__init__(VarOffset, validrange, PcdDataType)\r
+        super().__init__(VarOffset, validrange, PcdDataType)\r
         self.Type = 2\r
         RangeExpr = ""\r
         i = 0\r

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 6219675d2c1b6ad5c00d2b56c2a840ba4b684db8..9a98236a8c3414326739423ea04e3fd1a479cd61 100644 (file)
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -204,7 +204,7 @@ SupportedInMacroList = ['TARGET', 'TOOL_CHAIN_TAG', 'ARCH', 'FAMILY']
 \r
 class BaseExpression(object):\r
     def __init__(self, *args, **kwargs):\r
-        super(BaseExpression, self).__init__()\r
+        super().__init__()\r
 \r
     # Check if current token matches the operators given from parameter\r
     def _IsOperator(self, OpSet):\r
@@ -324,7 +324,7 @@ class ValueExpression(BaseExpression):
         return Val\r
 \r
     def __init__(self, Expression, SymbolTable={}):\r
-        super(ValueExpression, self).__init__(self, Expression, SymbolTable)\r
+        super().__init__(self, Expression, SymbolTable)\r
         self._NoProcess = False\r
         if not isinstance(Expression, type('')):\r
             self._Expr = Expression\r

diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/Source/Python/Common/RangeExpression.py
index 5449d2d1af38ea54d5b7ce07092e7fc0a4d618a3..f6c4dcd66634952491a03386d57a122dfa23e405 100644 (file)
--- a/BaseTools/Source/Python/Common/RangeExpression.py
+++ b/BaseTools/Source/Python/Common/RangeExpression.py
@@ -347,7 +347,7 @@ class RangeExpression(BaseExpression):
 \r
 \r
     def __init__(self, Expression, PcdDataType, SymbolTable = {}):\r
-        super(RangeExpression, self).__init__(self, Expression, PcdDataType, SymbolTable)\r
+        super().__init__(self, Expression, PcdDataType, SymbolTable)\r
         self._NoProcess = False\r
         if not isinstance(Expression, type('')):\r
             self._Expr = Expression\r

diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index 8969f84a2b46bb629e7fbc55a7919d61030b7a92..2e36fd233f0239e2cc84fbb64f6a2ced935ff543 100644 (file)
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -166,7 +166,7 @@ class StructurePcd(PcdClassObject):
             expressions = []\r
         if Packages is None:\r
             Packages = []\r
-        super(StructurePcd, self).__init__(Name, Guid, Type, DatumType, Value, Token, MaxDatumSize, SkuInfoList, IsOverrided, GuidValue, validateranges, validlists, expressions)\r
+        super().__init__(Name, Guid, Type, DatumType, Value, Token, MaxDatumSize, SkuInfoList, IsOverrided, GuidValue, validateranges, validlists, expressions)\r
         self.StructuredPcdIncludeFile = [] if StructuredPcdIncludeFile is None else StructuredPcdIncludeFile\r
         self.PackageDecs = Packages\r
         self.DefaultStoreName = [default_store]\r

diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index a3ff733f7e2c9581a66e57f60513192d093fe15f..9f2a3bcb5a12f8cbbe62ed30bc03b3b3e2bb4010 100644 (file)
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -139,7 +139,7 @@ class MetaFileParser(object):
         if FilePath in Class.MetaFiles:\r
             return Class.MetaFiles[FilePath]\r
         else:\r
-            ParserObject = super(MetaFileParser, Class).__new__(Class)\r
+            ParserObject = super().__new__(Class)\r
             Class.MetaFiles[FilePath] = ParserObject\r
             return ParserObject\r
 \r

diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
index 4b9180334ff957a03939fd920e0144be6563aab3..f4217969157ad4b9b10494bebe068a1441998a0d 100644 (file)
--- a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
+++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
@@ -22,7 +22,7 @@ from Common.BuildToolError import BUILD_ERROR
 \r
 class OrderedListDict(OrderedDict):\r
     def __init__(self, *args, **kwargs):\r
-        super(OrderedListDict, self).__init__(*args, **kwargs)\r
+        super().__init__(*args, **kwargs)\r
         self.default_factory = list\r
 \r
     def __missing__(self, key):\r