From 9073f0debc06a26dac7a8755e4a9ccab25fcad88 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Wed, 27 Sep 2017 19:16:05 +0200 Subject: [PATCH] Use the typical ordering of arguments for ClassContext. --- jedi/evaluate/__init__.py | 4 ++-- jedi/evaluate/representation.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py index 470f439f..6eeebf6e 100644 --- a/jedi/evaluate/__init__.py +++ b/jedi/evaluate/__init__.py @@ -245,7 +245,7 @@ class Evaluator(object): if def_ is not None: type_ = def_.type if type_ == 'classdef': - return [er.ClassContext(self, name.parent, context)] + return [er.ClassContext(self, context, name.parent)] elif type_ == 'funcdef': return [er.FunctionContext(self, context, name.parent)] @@ -378,7 +378,7 @@ class Evaluator(object): return func.get_function_execution() return func elif scope_node.type == 'classdef': - class_context = er.ClassContext(self, scope_node, parent_context) + class_context = er.ClassContext(self, parent_context, scope_node) if child_is_funcdef: # anonymous instance return AnonymousInstance(self, parent_context, class_context) diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py index fb7e81d5..cb4525b1 100644 --- a/jedi/evaluate/representation.py +++ b/jedi/evaluate/representation.py @@ -113,7 +113,7 @@ class ClassContext(use_metaclass(CachedMetaClass, context.TreeContext)): """ api_type = 'class' - def __init__(self, evaluator, classdef, parent_context): + def __init__(self, evaluator, parent_context, classdef): super(ClassContext, self).__init__(evaluator, parent_context=parent_context) self.tree_node = classdef