Remove the ImportWrapper and replace it with something simpler.

jedi/api/__init__.py

@@ -338,7 +338,7 @@ class Script(object):
                     if node.is_nested():
                         import_names |= set(path[-1] for path in node.paths())
                     for n in import_names:
-                        imports.ImportWrapper(context, n).follow()
+                        imports.infer_import(context, n)
                 elif node.type == 'expr_stmt':
                     types = context.eval_node(node)
                     for testlist in node.children[:-1:2]:

jedi/api/classes.py

@@ -500,8 +500,7 @@ class Completion(BaseDefinition):
         definition = self._definition
         if definition.isinstance(tree.Import):
             raise DeprecationWarning
-            i = imports.ImportWrapper(self._evaluator, self._name)
-            return i.follow()
+            return imports.infer_import(self._evaluator, self._name)
         return super(Completion, self)._follow_statements_imports()
 
     @memoize_method

jedi/api/usages.py

@@ -59,6 +59,10 @@ def resolve_potential_imports(evaluator, definitions):
         if isinstance(d, TreeNameDefinition):
             imp_or_stmt = d.tree_name.get_definition()
             if isinstance(imp_or_stmt, tree.Import):
-                s = imports.ImportWrapper(d.parent_context, d.tree_name)
-                new |= resolve_potential_imports(evaluator, set(s.follow(is_goto=True)))
+                new |= resolve_potential_imports(
+                    evaluator,
+                    set(imports.infer_import(
+                        d.parent_context, d.tree_name, is_goto=True
+                    ))
+                )
     return set(definitions) | new