moved get_names_for_scope to finder

jedi/api/__init__.py

@@ -29,6 +29,7 @@ from jedi.evaluate import representation as er
 from jedi.evaluate import compiled
 from jedi.evaluate import imports
 from jedi.evaluate import helpers
+from jedi.evaluate.finder import get_names_of_scope
 
 
 class NotFoundError(Exception):
@@ -170,8 +171,9 @@ class Script(object):
             scopes = list(self._prepare_goto(path, True))
         except NotFoundError:
             scopes = []
-            scope_generator = self._evaluator.get_names_of_scope(
-                self._parser.user_scope(), self._pos)
+            scope_generator = get_names_of_scope(self._evaluator,
+                                                 self._parser.user_scope(),
+                                                 self._pos)
             completions = []
             for scope, name_list in scope_generator:
                 for c in name_list:

jedi/api/classes.py

@@ -16,6 +16,7 @@ from jedi.evaluate import iterable
 from jedi.evaluate import imports
 from jedi.evaluate import compiled
 from jedi.api import keywords
+from jedi.evaluate.finder import get_names_of_scope
 
 
 def clear_caches():
@@ -550,8 +551,8 @@ def defined_names(evaluator, scope):
     :type scope: Scope
     :rtype: list of Definition
     """
-    pair = next(evaluator.get_names_of_scope(
-        scope, star_search=False, include_builtin=False), None)
+    pair = next(get_names_of_scope(evaluator, scope, star_search=False,
+                                   include_builtin=False), None)
     names = pair[1] if pair else []
     return [Definition(evaluator, d) for d in sorted(names, key=lambda s: s.start_pos)]