diff options
| -rw-r--r-- | astroid/bases.py | 2 | ||||
| -rw-r--r-- | astroid/builder.py | 2 | ||||
| -rw-r--r-- | astroid/exceptions.py | 14 | ||||
| -rw-r--r-- | astroid/interpreter/_import/spec.py | 2 | ||||
| -rw-r--r-- | astroid/node_classes.py | 58 | ||||
| -rw-r--r-- | astroid/scoped_nodes.py | 14 |
6 files changed, 44 insertions, 48 deletions
diff --git a/astroid/bases.py b/astroid/bases.py index 5c6abbf9..9c743031 100644 --- a/astroid/bases.py +++ b/astroid/bases.py @@ -486,7 +486,7 @@ class BoundMethod(UnboundMethod): if new_cls: return iter((new_cls,)) - return super(BoundMethod, self).infer_call_result(caller, context) + return super().infer_call_result(caller, context) def bool_value(self, context=None): return True diff --git a/astroid/builder.py b/astroid/builder.py index 9e808f1b..142764b1 100644 --- a/astroid/builder.py +++ b/astroid/builder.py @@ -77,7 +77,7 @@ class AstroidBuilder(raw_building.InspectBuilder): # pylint: disable=redefined-outer-name def __init__(self, manager=None, apply_transforms=True): - super(AstroidBuilder, self).__init__() + super().__init__() self._manager = manager or MANAGER self._apply_transforms = apply_transforms diff --git a/astroid/exceptions.py b/astroid/exceptions.py index 7e9d655e..08e72c13 100644 --- a/astroid/exceptions.py +++ b/astroid/exceptions.py @@ -28,7 +28,7 @@ class AstroidError(Exception): """ def __init__(self, message="", **kws): - super(AstroidError, self).__init__(message) + super().__init__(message) self.message = message for key, value in kws.items(): setattr(self, key, value) @@ -46,7 +46,7 @@ class AstroidBuildingError(AstroidError): """ def __init__(self, message="Failed to import module {modname}.", **kws): - super(AstroidBuildingError, self).__init__(message, **kws) + super().__init__(message, **kws) class AstroidImportError(AstroidBuildingError): @@ -69,7 +69,7 @@ class TooManyLevelsError(AstroidImportError): message="Relative import with too many levels " "({level}) for module {name!r}", **kws ): - super(TooManyLevelsError, self).__init__(message, **kws) + super().__init__(message, **kws) class AstroidSyntaxError(AstroidBuildingError): @@ -89,7 +89,7 @@ class NoDefault(AstroidError): name = None def __init__(self, message="{func!r} has no default for {name!r}.", **kws): - super(NoDefault, self).__init__(message, **kws) + super().__init__(message, **kws) class ResolveError(AstroidError): @@ -157,7 +157,7 @@ class InferenceError(ResolveError): context = None def __init__(self, message="Inference failed for {node!r}.", **kws): - super(InferenceError, self).__init__(message, **kws) + super().__init__(message, **kws) # Why does this inherit from InferenceError rather than ResolveError? @@ -175,7 +175,7 @@ class NameInferenceError(InferenceError): scope = None def __init__(self, message="{name!r} not found in {scope!r}.", **kws): - super(NameInferenceError, self).__init__(message, **kws) + super().__init__(message, **kws) class AttributeInferenceError(ResolveError): @@ -191,7 +191,7 @@ class AttributeInferenceError(ResolveError): attribute = None def __init__(self, message="{attribute!r} not found on {target!r}.", **kws): - super(AttributeInferenceError, self).__init__(message, **kws) + super().__init__(message, **kws) class UseInferenceDefault(Exception): diff --git a/astroid/interpreter/_import/spec.py b/astroid/interpreter/_import/spec.py index 96c142ae..3cf5fea5 100644 --- a/astroid/interpreter/_import/spec.py +++ b/astroid/interpreter/_import/spec.py @@ -184,7 +184,7 @@ class ZipFinder(Finder): """Finder that knows how to find a module inside zip files.""" def __init__(self, path): - super(ZipFinder, self).__init__(path) + super().__init__(path) self._zipimporters = _precache_zipimporters(path) def find_module(self, modname, module_parts, processed, submodule_path): diff --git a/astroid/node_classes.py b/astroid/node_classes.py index 647272be..a7fcf190 100644 --- a/astroid/node_classes.py +++ b/astroid/node_classes.py @@ -990,7 +990,7 @@ class _BaseContainer( :type: list(NodeNG) """ - super(_BaseContainer, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def postinit(self, elts): """Do some setup after initialisation. @@ -1286,7 +1286,7 @@ class AssignName( :type: str or None """ - super(AssignName, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) class DelName( @@ -1326,7 +1326,7 @@ class DelName( :type: str or None """ - super(DelName, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) class Name(mixins.NoChildrenMixin, LookupMixIn, NodeNG): @@ -1367,7 +1367,7 @@ class Name(mixins.NoChildrenMixin, LookupMixIn, NodeNG): :type: str or None """ - super(Name, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def _get_name_nodes(self): yield self @@ -1439,7 +1439,7 @@ class Arguments(mixins.AssignTypeMixin, NodeNG): :param parent: The parent node in the syntax tree. :type parent: NodeNG or None """ - super(Arguments, self).__init__(parent=parent) + super().__init__(parent=parent) self.vararg = vararg """The name of the variable length arguments. @@ -1626,7 +1626,7 @@ class Arguments(mixins.AssignTypeMixin, NodeNG): :type: int or None """ - lineno = super(Arguments, self).fromlineno + lineno = super().fromlineno return max(lineno, self.parent.fromlineno or 0) @decorators.cachedproperty @@ -1846,7 +1846,7 @@ class AssignAttr(mixins.ParentAssignTypeMixin, NodeNG): :type: str or None """ - super(AssignAttr, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def postinit(self, expr=None): """Do some setup after initialisation. @@ -2065,7 +2065,7 @@ class AugAssign(mixins.AssignTypeMixin, Statement): :type: str or None """ - super(AugAssign, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def postinit(self, target=None, value=None): """Do some setup after initialisation. @@ -2178,7 +2178,7 @@ class BinOp(NodeNG): :type: str or None """ - super(BinOp, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def postinit(self, left=None, right=None): """Do some setup after initialisation. @@ -2266,7 +2266,7 @@ class BoolOp(NodeNG): :type: str or None """ - super(BoolOp, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def postinit(self, values=None): """Do some setup after initialisation. @@ -2464,7 +2464,7 @@ class Comprehension(NodeNG): :param parent: The parent node in the syntax tree. :type parent: NodeNG or None """ - super(Comprehension, self).__init__() + super().__init__() self.parent = parent # pylint: disable=redefined-builtin; same name as builtin ast module. @@ -2561,7 +2561,7 @@ class Const(mixins.NoChildrenMixin, NodeNG, bases.Instance): :type: object """ - super(Const, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def __getattr__(self, name): # This is needed because of Proxy's __getattr__ method. @@ -2742,7 +2742,7 @@ class DelAttr(mixins.ParentAssignTypeMixin, NodeNG): :type: str or None """ - super(DelAttr, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def postinit(self, expr=None): """Do some setup after initialisation. @@ -2815,7 +2815,7 @@ class Dict(NodeNG, bases.Instance): :type: list(tuple(NodeNG, NodeNG)) """ - super(Dict, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def postinit(self, items): """Do some setup after initialisation. @@ -3347,7 +3347,7 @@ class ImportFrom(mixins.NoChildrenMixin, mixins.ImportFromMixin, Statement): :type: int """ - super(ImportFrom, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) class Attribute(NodeNG): @@ -3382,7 +3382,7 @@ class Attribute(NodeNG): :type: str or None """ - super(Attribute, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def postinit(self, expr=None): """Do some setup after initialisation. @@ -3427,7 +3427,7 @@ class Global(mixins.NoChildrenMixin, Statement): :type: list(str) """ - super(Global, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def _infer_name(self, frame, name): return name @@ -3595,7 +3595,7 @@ class Import(mixins.NoChildrenMixin, mixins.ImportFromMixin, Statement): :type: list(tuple(str, str or None)) or None """ - super(Import, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) class Index(NodeNG): @@ -3668,7 +3668,7 @@ class Keyword(NodeNG): :type: Name or None """ - super(Keyword, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def postinit(self, value=None): """Do some setup after initialisation. @@ -3713,7 +3713,7 @@ class List(_BaseContainer): :type: Context or None """ - super(List, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def pytype(self): """Get the name of the type that this node represents. @@ -3768,7 +3768,7 @@ class Nonlocal(mixins.NoChildrenMixin, Statement): :type: list(str) """ - super(Nonlocal, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def _infer_name(self, frame, name): return name @@ -3824,7 +3824,7 @@ class Print(Statement): :type: bool or None """ - super(Print, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def postinit(self, dest=None, values=None): """Do some setup after initialisation. @@ -4077,9 +4077,7 @@ class Starred(mixins.ParentAssignTypeMixin, NodeNG): :type: Context or None """ - super(Starred, self).__init__( - lineno=lineno, col_offset=col_offset, parent=parent - ) + super().__init__(lineno=lineno, col_offset=col_offset, parent=parent) def postinit(self, value=None): """Do some setup after initialisation. @@ -4135,9 +4133,7 @@ class Subscript(NodeNG): :type: Context or None """ - super(Subscript, self).__init__( - lineno=lineno, col_offset=col_offset, parent=parent - ) + super().__init__(lineno=lineno, col_offset=col_offset, parent=parent) # pylint: disable=redefined-builtin; had to use the same name as builtin ast module. def postinit(self, value=None, slice=None): @@ -4330,7 +4326,7 @@ class Tuple(_BaseContainer): :type: Context or None """ - super(Tuple, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def pytype(self): """Get the name of the type that this node represents. @@ -4386,7 +4382,7 @@ class UnaryOp(NodeNG): :type: str or None """ - super(UnaryOp, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def postinit(self, operand=None): """Do some setup after initialisation. @@ -4768,7 +4764,7 @@ class EvaluatedObject(NodeNG): def __init__(self, original, value): self.original = original self.value = value - super(EvaluatedObject, self).__init__( + super().__init__( lineno=self.original.lineno, col_offset=self.original.col_offset, parent=self.original.parent, diff --git a/astroid/scoped_nodes.py b/astroid/scoped_nodes.py index de2d151e..0406946f 100644 --- a/astroid/scoped_nodes.py +++ b/astroid/scoped_nodes.py @@ -814,7 +814,7 @@ class GeneratorExp(ComprehensionScope): :type: dict(str, NodeNG) """ - super(GeneratorExp, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def postinit(self, elt=None, generators=None): """Do some setup after initialisation. @@ -890,7 +890,7 @@ class DictComp(ComprehensionScope): :type: dict(str, NodeNG) """ - super(DictComp, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def postinit(self, key=None, value=None, generators=None): """Do some setup after initialisation. @@ -966,7 +966,7 @@ class SetComp(ComprehensionScope): :type: dict(str, NodeNG) """ - super(SetComp, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def postinit(self, elt=None, generators=None): """Do some setup after initialisation. @@ -1062,7 +1062,7 @@ class ListComp(_ListComp, ComprehensionScope): :type: dict(str, NodeNG) """ - super(ListComp, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def _infer_decorator_callchain(node): @@ -1162,7 +1162,7 @@ class Lambda(mixins.FilterStmtsMixin, LocalsDictNodeNG): :type: list(NodeNG) """ - super(Lambda, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) def postinit(self, args, body): """Do some setup after initialisation. @@ -1367,7 +1367,7 @@ class FunctionDef(mixins.MultiLineBlockMixin, node_classes.Statement, Lambda): """ self.instance_attrs = {} - super(FunctionDef, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) if parent: frame = parent.frame() frame.set_local(name, self) @@ -1974,7 +1974,7 @@ class ClassDef(mixins.FilterStmtsMixin, LocalsDictNodeNG, node_classes.Statement :type doc: str or None """ - super(ClassDef, self).__init__(lineno, col_offset, parent) + super().__init__(lineno, col_offset, parent) if parent is not None: parent.frame().set_local(name, self) |