From 4d7db353403c19970af5a3f49a39585e177cc01a Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Fri, 26 Sep 2014 16:02:03 +0200 Subject: [PATCH] Fix a few last tests, now Jedi's working again, tests are passing. --- jedi/evaluate/finder.py | 4 ++-- jedi/parser/representation.py | 3 ++- test/test_evaluate/test_representation.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jedi/evaluate/finder.py b/jedi/evaluate/finder.py index 822f9ab7..33188bbf 100644 --- a/jedi/evaluate/finder.py +++ b/jedi/evaluate/finder.py @@ -461,13 +461,13 @@ def get_names_of_scope(evaluator, scope, position=None, star_search=True, includ >>> from jedi.evaluate import Evaluator >>> pairs = list(get_names_of_scope(Evaluator(), scope)) >>> pairs[0] - (, []) + (, []) Then it yield the names from one level outer scope. For this example, this is the most outer scope. >>> pairs[1] - (>, [, ]) + (>, [, ]) After that we have a few underscore names that have been defined diff --git a/jedi/parser/representation.py b/jedi/parser/representation.py index ba9f3b8e..27feec58 100644 --- a/jedi/parser/representation.py +++ b/jedi/parser/representation.py @@ -1552,7 +1552,8 @@ class NamePart(object): return self._string def __repr__(self): - return "<%s: %s>" % (type(self).__name__, self._string) + return "<%s: %s@%s,%s>" % (type(self).__name__, self._string, + self.start_pos[0], self.start_pos[1]) def get_code(self): return self._string diff --git a/test/test_evaluate/test_representation.py b/test/test_evaluate/test_representation.py index 2ed4a40d..315ba63e 100644 --- a/test/test_evaluate/test_representation.py +++ b/test/test_evaluate/test_representation.py @@ -5,7 +5,7 @@ from jedi import Script def get_definition_and_evaluator(source): d = Script(dedent(source)).goto_definitions()[0] - return d._name.parent.parent, d._evaluator + return d._name.parent, d._evaluator def test_function_execution():