diff --git a/jedi/evaluate/finder.py b/jedi/evaluate/finder.py index d7326050..310f65d2 100644 --- a/jedi/evaluate/finder.py +++ b/jedi/evaluate/finder.py @@ -330,7 +330,6 @@ class NameFinder(object): return doc_params if not isinstance(param, ExecutedParam): - print(param) # Param owns no information itself. res_new += dynamic.search_params(evaluator, param) if not res_new: diff --git a/jedi/evaluate/param.py b/jedi/evaluate/param.py index 911e9bf8..c68986fe 100644 --- a/jedi/evaluate/param.py +++ b/jedi/evaluate/param.py @@ -297,10 +297,8 @@ def _unpack_var_args(evaluator, var_args, func): # Include self at this place. argument_list.append((None, [helpers.FakeStatement([func.instance])])) - print(var_args) # `var_args` is typically an Array, and not a list. for stmt in _reorder_var_args(var_args.iterate()): - print(stmt) if not isinstance(stmt, pr.Statement): if stmt is None: argument_list.append((None, [])) diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py index 6f6d8894..38e975c9 100644 --- a/jedi/evaluate/representation.py +++ b/jedi/evaluate/representation.py @@ -235,7 +235,7 @@ def get_instance_el(evaluator, instance, var, is_class_var=False): Returns an InstanceElement if it makes sense, otherwise leaves the object untouched. """ - if isinstance(var, (Instance, compiled.CompiledObject, pr.Operator, Token, + if isinstance(var, (Instance, compiled.CompiledObject, pr.Leaf, pr.Module, FunctionExecution, pr.Name)): if isinstance(var, pr.Name): # TODO temp solution, remove later, Name should never get diff --git a/jedi/parser/representation.py b/jedi/parser/representation.py index ec19d659..3df539ab 100644 --- a/jedi/parser/representation.py +++ b/jedi/parser/representation.py @@ -182,7 +182,7 @@ class Base(object): return False -class _Leaf(Base): +class Leaf(Base): __slots__ = ('value', 'parent', 'start_pos', 'prefix') def __init__(self, value, start_pos, prefix=''): @@ -227,11 +227,11 @@ class _Leaf(Base): return "<%s: %s>" % (type(self).__name__, repr(self.value)) -class Whitespace(_Leaf): +class Whitespace(Leaf): """Contains NEWLINE and ENDMARKER tokens.""" -class Name(_Leaf): +class Name(Leaf): """ A string. Sometimes it is important to know if the string belongs to a name or not. @@ -286,7 +286,7 @@ class Name(_Leaf): return indexes -class Literal(_Leaf): +class Literal(Leaf): def eval(self): return literal_eval(self.value) @@ -301,7 +301,7 @@ class Literal(_Leaf): return "<%s: %s>" % (type(self).__name__, self.value) -class Operator(_Leaf): +class Operator(Leaf): def __str__(self): return self.value @@ -323,7 +323,7 @@ class Operator(_Leaf): return hash(self.value) -class Keyword(_Leaf): +class Keyword(Leaf): def __eq__(self, other): """ Make comparisons with strings easy. @@ -362,7 +362,7 @@ class Simple(Base): Move the Node's start_pos. """ for c in self.children: - if isinstance(c, _Leaf): + if isinstance(c, Leaf): c.start_pos = (c.start_pos[0] + line_offset, c.start_pos[1] + column_offset) else: