From 70d85d1b3a4efabcd74b2d7803d0897d48a3bdf0 Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Mon, 12 May 2014 11:18:47 +0200
Subject: [PATCH] strip_imports -> follow_imports

---
 jedi/api/classes.py           | 2 +-
 jedi/evaluate/__init__.py     | 6 +++---
 jedi/evaluate/imports.py      | 4 ++--
 jedi/parser/representation.py | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jedi/api/classes.py b/jedi/api/classes.py
index c620a123..e5c789ea 100644
--- a/jedi/api/classes.py
+++ b/jedi/api/classes.py
@@ -316,7 +316,7 @@ class BaseDefinition(object):
         if stripped.isinstance(pr.Statement):
             return self._evaluator.eval_statement(stripped)
         elif stripped.isinstance(pr.Import):
-            return imports.strip_imports(self._evaluator, [stripped])
+            return imports.follow_imports(self._evaluator, [stripped])
         else:
             return [stripped]
 
diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py
index 00fb265e..0381c04d 100644
--- a/jedi/evaluate/__init__.py
+++ b/jedi/evaluate/__init__.py
@@ -230,7 +230,7 @@ class Evaluator(object):
             else:
                 # for pr.Literal
                 types = [compiled.create(self, current.value)]
-            types = imports.strip_imports(self, types)
+            types = imports.follow_imports(self, types)
 
         return self.follow_path(path, types, scope)
 
@@ -292,7 +292,7 @@ class Evaluator(object):
                 if filter_private_variable(typ, scope, current):
                     return []
             types = self.find_types(typ, current)
-            result = imports.strip_imports(self, types)
+            result = imports.follow_imports(self, types)
         return self.follow_path(path, result, scope)
 
     @debug.increase_indent
@@ -330,7 +330,7 @@ class Evaluator(object):
                     debug.warning("no execution possible %s", obj)
 
             debug.dbg('execute result: %s in %s', stmts, obj)
-            return imports.strip_imports(self, stmts)
+            return imports.follow_imports(self, stmts)
 
     def goto(self, stmt, call_path):
         scope = stmt.get_parent_until(pr.IsScope)
diff --git a/jedi/evaluate/imports.py b/jedi/evaluate/imports.py
index 8db89324..6c6d742a 100644
--- a/jedi/evaluate/imports.py
+++ b/jedi/evaluate/imports.py
@@ -458,7 +458,7 @@ class _Importer(object):
             return load_module(name=path), rest
 
 
-def strip_imports(evaluator, scopes):
+def follow_imports(evaluator, scopes):
     """
     Here we strip the imports - they don't get resolved necessarily.
     Really used anymore? Merge with remove_star_imports?
@@ -483,7 +483,7 @@ def remove_star_imports(evaluator, scope, ignored_modules=()):
     """
     if isinstance(scope, StarImportModule):
         return scope.star_import_modules
-    modules = strip_imports(evaluator, (i for i in scope.get_imports() if i.star))
+    modules = follow_imports(evaluator, (i for i in scope.get_imports() if i.star))
     new = []
     for m in modules:
         if m not in ignored_modules:
diff --git a/jedi/parser/representation.py b/jedi/parser/representation.py
index b3eb8251..114b8cbe 100644
--- a/jedi/parser/representation.py
+++ b/jedi/parser/representation.py
@@ -784,7 +784,7 @@ class Import(Simple):
             import foo.bar
         """
         return not self.alias and not self.from_ns \
-            and len(self.namespace.names) > 1 \
+            and len(self.namespace.names) > 1
 
 
 class KeywordStatement(Base):