VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-01-17 09:25:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

precedence._is_string -> precedence.is_string

Browse Source
This commit is contained in:
Dave Halter
2014-09-04 14:13:26 +02:00
parent 7b2e11d71b
commit 42d6b57599
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jedi/evaluate/precedence.py
View File

@@ -291,13 +291,13 @@ def _is_number(obj):
and isinstance(obj.obj, (int, float))
def _is_string(obj):
def is_string(obj):
return isinstance(obj, CompiledObject) \
and isinstance(obj.obj, (str, unicode))
def is_literal(obj):
return _is_number(obj) or _is_string(obj)
return _is_number(obj) or is_string(obj)
def _is_tuple(obj):
@@ -316,12 +316,12 @@ def _element_calculate(evaluator, left, operator, right):
r_is_num = _is_number(right)
if operator == '*':
# for iterables, ignore * operations
if isinstance(left, iterable.Array) or _is_string(left):
if isinstance(left, iterable.Array) or is_string(left):
return [left]
elif isinstance(right, iterable.Array) or _is_string(right):
elif isinstance(right, iterable.Array) or is_string(right):
return [right]
elif operator == '+':
if l_is_num and r_is_num or _is_string(left) and _is_string(right):
if l_is_num and r_is_num or is_string(left) and is_string(right):
return [create(evaluator, left.obj + right.obj)]
elif _is_tuple(left) and _is_tuple(right) or _is_list(left) and _is_list(right):
return [iterable.MergedArray(evaluator, (left, right))]

4
jedi/evaluate/sys_path.py
View File

@@ -67,9 +67,9 @@ def _paths_from_assignment(evaluator, statement):
# complicated checks.
from jedi.evaluate.iterable import get_iterator_types
from jedi.evaluate.precedence import _is_string
from jedi.evaluate.precedence import is_string
for val in get_iterator_types(evaluator.eval_statement(statement)):
if _is_string(val):
if is_string(val):
yield val.obj