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

There were a few bugs in the previous commit

Browse Source
This commit is contained in:
Dave Halter
2017-12-28 23:25:09 +01:00
parent ba81aa16a2
commit 4b72a89379
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jedi/evaluate/syntax_tree.py
View File

@@ -5,7 +5,7 @@ import copy
from parso.python import tree from parso.python import tree
from jedi._compatibility import force_unicode from jedi._compatibility import force_unicode, unicode
from jedi import debug from jedi import debug
from jedi import parser_utils from jedi import parser_utils
from jedi.evaluate.base_context import ContextSet, NO_CONTEXTS, ContextualizedNode, \ from jedi.evaluate.base_context import ContextSet, NO_CONTEXTS, ContextualizedNode, \
@@ -368,7 +368,11 @@ def _bool_to_context(evaluator, bool_):
def _eval_comparison_part(evaluator, context, left, operator, right): def _eval_comparison_part(evaluator, context, left, operator, right):
l_is_num = is_number(left) l_is_num = is_number(left)
r_is_num = is_number(right) r_is_num = is_number(right)
str_operator = force_unicode(str(operator.value)) if isinstance(operator, unicode):
str_operator = operator
else:
str_operator = force_unicode(str(operator.value))
if str_operator == '*': if str_operator == '*':
# for iterables, ignore * operations # for iterables, ignore * operations
if isinstance(left, iterable.AbstractIterable) or is_string(left): if isinstance(left, iterable.AbstractIterable) or is_string(left):

6
test/run.py
View File

@@ -125,6 +125,7 @@ from jedi._compatibility import unicode, is_py3
from jedi.api.classes import Definition from jedi.api.classes import Definition
from jedi.api.completion import get_user_scope from jedi.api.completion import get_user_scope
from jedi import parser_utils from jedi import parser_utils
from jedi.api.environment import get_default_environment
TEST_COMPLETIONS = 0 TEST_COMPLETIONS = 0
@@ -432,11 +433,12 @@ if __name__ == '__main__':
% (case.line_nr - 1, actual, desired)) % (case.line_nr - 1, actual, desired))
return 1 return 1
environment = get_default_environment()
import traceback import traceback
current = cases[0].path if cases else None current = cases[0].path if cases else None
count = fails = 0 count = fails = 0
for c in cases: for c in cases:
if c.get_skip_reason(): if c.get_skip_reason(environment):
continue continue
if current != c.path: if current != c.path:
file_change(current, count, fails) file_change(current, count, fails)
@@ -444,7 +446,7 @@ if __name__ == '__main__':
count = fails = 0 count = fails = 0
try: try:
if c.run(report): if c.run(report, environment):
tests_fail += 1 tests_fail += 1
fails += 1 fails += 1
except Exception: except Exception: