VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Fix types tests.

Browse Source
This commit is contained in:
Dave Halter
2014-11-20 11:16:52 +01:00
parent 2c3a7b6d6c
commit 53c2a1679c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jedi/evaluate/__init__.py
View File

@@ -220,7 +220,8 @@ class Evaluator(object):
else: else:
c = atom.children c = atom.children
# Parentheses without commas are not tuples. # Parentheses without commas are not tuples.
if c[0] == '(' and not (pr.is_node(c[1], 'testlist_comp') if c[0] == '(' and not len(c) == 2 \
and not(pr.is_node(c[1], 'testlist_comp')
and len(c[1].children) > 1): and len(c[1].children) > 1):
return self.eval_element(c[1]) return self.eval_element(c[1])
try: try:

2
jedi/evaluate/iterable.py
View File

@@ -240,7 +240,7 @@ class Array(IterableWrapper):
It returns e.g. for a list: append, pop, ... It returns e.g. for a list: append, pop, ...
""" """
# `array.type` is a string with the type, e.g. 'list'. # `array.type` is a string with the type, e.g. 'list'.
scope = self._evaluator.find_types(compiled.builtin, self._array.type)[0] scope = self._evaluator.find_types(compiled.builtin, self.type)[0]
scope = self._evaluator.execute(scope)[0] # builtins only have one class scope = self._evaluator.execute(scope)[0] # builtins only have one class
from jedi.evaluate.representation import get_instance_el from jedi.evaluate.representation import get_instance_el
for _, names in scope.scope_names_generator(): for _, names in scope.scope_names_generator():