diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index b0aa4838e9..2815091de8 100644 --- 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 return cls.__ObjectCache[Key] # it didnt exist. create it, cache it, then return it - RetVal = cls.__ObjectCache[Key] = super(AutoGen, cls).__new__(cls) + RetVal = cls.__ObjectCache[Key] = super().__new__(cls) return RetVal def __init__ (self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs): - super(AutoGen, self).__init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs) + super().__init__() ## hash() operator # @@ -235,7 +235,7 @@ class WorkspaceAutoGen(AutoGen): # call super().__init__ then call the worker function with different parameter count def __init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs): if not hasattr(self, "_Init"): - super(WorkspaceAutoGen, self).__init__(Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs) + super().__init__(Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs) self._InitWorker(Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs) self._Init = True @@ -973,7 +973,7 @@ class PlatformAutoGen(AutoGen): # call super().__init__ then call the worker function with different parameter count def __init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs): if not hasattr(self, "_Init"): - super(PlatformAutoGen, self).__init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs) + super().__init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs) self._InitWorker(Workspace, MetaFile, Target, Toolchain, Arch) self._Init = True # @@ -2425,7 +2425,7 @@ class ModuleAutoGen(AutoGen): # call super().__init__ then call the worker function with different parameter count def __init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs): if not hasattr(self, "_Init"): - super(ModuleAutoGen, self).__init__(Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs) + super().__init__(Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs) self._InitWorker(Workspace, MetaFile, Target, Toolchain, Arch, *args) self._Init = True @@ -2439,7 +2439,7 @@ class ModuleAutoGen(AutoGen): EdkLogger.verbose("Module [%s] for [%s] is not employed by active platform\n" \ % (MetaFile, Arch)) return None - return super(ModuleAutoGen, cls).__new__(cls, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs) + return super().__new__(cls, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs) ## Initialize ModuleAutoGen # diff --git a/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py b/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py index 6ddf38fd0d..379d404c76 100644 --- 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): class VAR_CHECK_PCD_VALID_LIST(VAR_CHECK_PCD_VALID_OBJ): def __init__(self, VarOffset, validlist, PcdDataType): - super(VAR_CHECK_PCD_VALID_LIST, self).__init__(VarOffset, validlist, PcdDataType) + super().__init__(VarOffset, validlist, PcdDataType) self.Type = 1 valid_num_list = [] for item in self.rawdata: @@ -261,7 +261,7 @@ class VAR_CHECK_PCD_VALID_LIST(VAR_CHECK_PCD_VALID_OBJ): class VAR_CHECK_PCD_VALID_RANGE(VAR_CHECK_PCD_VALID_OBJ): def __init__(self, VarOffset, validrange, PcdDataType): - super(VAR_CHECK_PCD_VALID_RANGE, self).__init__(VarOffset, validrange, PcdDataType) + super().__init__(VarOffset, validrange, PcdDataType) self.Type = 2 RangeExpr = "" i = 0 diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py index 6219675d2c..9a98236a8c 100644 --- 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'] class BaseExpression(object): def __init__(self, *args, **kwargs): - super(BaseExpression, self).__init__() + super().__init__() # Check if current token matches the operators given from parameter def _IsOperator(self, OpSet): @@ -324,7 +324,7 @@ class ValueExpression(BaseExpression): return Val def __init__(self, Expression, SymbolTable={}): - super(ValueExpression, self).__init__(self, Expression, SymbolTable) + super().__init__(self, Expression, SymbolTable) self._NoProcess = False if not isinstance(Expression, type('')): self._Expr = Expression diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/Source/Python/Common/RangeExpression.py index 5449d2d1af..f6c4dcd666 100644 --- a/BaseTools/Source/Python/Common/RangeExpression.py +++ b/BaseTools/Source/Python/Common/RangeExpression.py @@ -347,7 +347,7 @@ class RangeExpression(BaseExpression): def __init__(self, Expression, PcdDataType, SymbolTable = {}): - super(RangeExpression, self).__init__(self, Expression, PcdDataType, SymbolTable) + super().__init__(self, Expression, PcdDataType, SymbolTable) self._NoProcess = False if not isinstance(Expression, type('')): self._Expr = Expression diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py index 8969f84a2b..2e36fd233f 100644 --- a/BaseTools/Source/Python/Workspace/BuildClassObject.py +++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py @@ -166,7 +166,7 @@ class StructurePcd(PcdClassObject): expressions = [] if Packages is None: Packages = [] - super(StructurePcd, self).__init__(Name, Guid, Type, DatumType, Value, Token, MaxDatumSize, SkuInfoList, IsOverrided, GuidValue, validateranges, validlists, expressions) + super().__init__(Name, Guid, Type, DatumType, Value, Token, MaxDatumSize, SkuInfoList, IsOverrided, GuidValue, validateranges, validlists, expressions) self.StructuredPcdIncludeFile = [] if StructuredPcdIncludeFile is None else StructuredPcdIncludeFile self.PackageDecs = Packages self.DefaultStoreName = [default_store] diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py index a3ff733f7e..9f2a3bcb5a 100644 --- 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: return Class.MetaFiles[FilePath] else: - ParserObject = super(MetaFileParser, Class).__new__(Class) + ParserObject = super().__new__(Class) Class.MetaFiles[FilePath] = ParserObject return ParserObject diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py index 4b9180334f..f421796915 100644 --- a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py +++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py @@ -22,7 +22,7 @@ from Common.BuildToolError import BUILD_ERROR class OrderedListDict(OrderedDict): def __init__(self, *args, **kwargs): - super(OrderedListDict, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.default_factory = list def __missing__(self, key):