mirror of
https://github.com/davidhalter/jedi.git
synced 2026-05-25 17:58:35 +08:00
precedence._is_string -> precedence.is_string
This commit is contained in:
@@ -291,13 +291,13 @@ def _is_number(obj):
|
|||||||
and isinstance(obj.obj, (int, float))
|
and isinstance(obj.obj, (int, float))
|
||||||
|
|
||||||
|
|
||||||
def _is_string(obj):
|
def is_string(obj):
|
||||||
return isinstance(obj, CompiledObject) \
|
return isinstance(obj, CompiledObject) \
|
||||||
and isinstance(obj.obj, (str, unicode))
|
and isinstance(obj.obj, (str, unicode))
|
||||||
|
|
||||||
|
|
||||||
def is_literal(obj):
|
def is_literal(obj):
|
||||||
return _is_number(obj) or _is_string(obj)
|
return _is_number(obj) or is_string(obj)
|
||||||
|
|
||||||
|
|
||||||
def _is_tuple(obj):
|
def _is_tuple(obj):
|
||||||
@@ -316,12 +316,12 @@ def _element_calculate(evaluator, left, operator, right):
|
|||||||
r_is_num = _is_number(right)
|
r_is_num = _is_number(right)
|
||||||
if operator == '*':
|
if operator == '*':
|
||||||
# for iterables, ignore * operations
|
# for iterables, ignore * operations
|
||||||
if isinstance(left, iterable.Array) or _is_string(left):
|
if isinstance(left, iterable.Array) or is_string(left):
|
||||||
return [left]
|
return [left]
|
||||||
elif isinstance(right, iterable.Array) or _is_string(right):
|
elif isinstance(right, iterable.Array) or is_string(right):
|
||||||
return [right]
|
return [right]
|
||||||
elif operator == '+':
|
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)]
|
return [create(evaluator, left.obj + right.obj)]
|
||||||
elif _is_tuple(left) and _is_tuple(right) or _is_list(left) and _is_list(right):
|
elif _is_tuple(left) and _is_tuple(right) or _is_list(left) and _is_list(right):
|
||||||
return [iterable.MergedArray(evaluator, (left, right))]
|
return [iterable.MergedArray(evaluator, (left, right))]
|
||||||
|
|||||||
@@ -67,9 +67,9 @@ def _paths_from_assignment(evaluator, statement):
|
|||||||
# complicated checks.
|
# complicated checks.
|
||||||
|
|
||||||
from jedi.evaluate.iterable import get_iterator_types
|
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)):
|
for val in get_iterator_types(evaluator.eval_statement(statement)):
|
||||||
if _is_string(val):
|
if is_string(val):
|
||||||
yield val.obj
|
yield val.obj
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user