VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-06 22:14:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a few things that were broken by the mixed object refactoring.

Browse Source
This commit is contained in:
Dave Halter
2016-12-16 17:29:37 +01:00
parent 9ac301d0c3
commit 5fb5580259
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jedi/evaluate/instance.py
View File

@@ -175,7 +175,6 @@ class AbstractInstanceContext(Context):
class CompiledInstance(AbstractInstanceContext): class CompiledInstance(AbstractInstanceContext):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(CompiledInstance, self).__init__(*args, **kwargs) super(CompiledInstance, self).__init__(*args, **kwargs)
# I don't think that dynamic append lookups should happen here. That # I don't think that dynamic append lookups should happen here. That
@@ -246,8 +245,9 @@ class CompiledInstanceClassFilter(compiled.CompiledObjectFilter):
) )
self._instance = instance self._instance = instance
def _create(self, name): def _create_name(self, name):
return self.name_class(self._evaluator, self._instance, self._compiled_obj, name) return self.name_class(
self._evaluator, self._instance, self._compiled_object, name)
class BoundMethod(er.FunctionContext): class BoundMethod(er.FunctionContext):

1
jedi/evaluate/iterable.py
View File

@@ -39,6 +39,7 @@ from jedi.evaluate import precedence
class AbstractSequence(context.Context): class AbstractSequence(context.Context):
builtin_methods = {} builtin_methods = {}
api_type = 'instance'
def __init__(self, evaluator): def __init__(self, evaluator):
super(AbstractSequence, self).__init__(evaluator, evaluator.BUILTINS) super(AbstractSequence, self).__init__(evaluator, evaluator.BUILTINS)

2
test/run.py
View File

@@ -193,6 +193,8 @@ class IntegrationTestCase(object):
module_context = script._get_module() module_context = script._get_module()
# The context shouldn't matter for the test results. # The context shouldn't matter for the test results.
user_context = get_user_scope(module_context, (self.line_nr, 0)) user_context = get_user_scope(module_context, (self.line_nr, 0))
if user_context.api_type == 'function':
user_context = user_context.get_function_execution()
element.parent = user_context.get_node() element.parent = user_context.get_node()
results = evaluator.eval_element(user_context, element) results = evaluator.eval_element(user_context, element)
if not results: if not results: