Import as fix

supplement/linter.py

@@ -290,6 +290,9 @@ def visit_Import(self, node):
 
     def visit_ImportFrom(self, node):
         idx = 0
+        if node.module == '__future__':
+            return
+
         if node.module:
             idx += node.module.count('.') + 1
 
@@ -381,7 +384,21 @@ def visit_ListComp(self, node):
     def visit_For(self, node):
         start = node.body[0]
         with self.loop((start.lineno, start.col_offset), self.get_expr_end(node)):
-            self.generic_visit(node)
+            self.visit(node.target)
+            self.visit(node.iter)
+
+            oldbranch = self.scope.branch
+            branch = oldbranch.add_child(Branch(oldbranch))
+
+            self.scope.branch = branch
+            for r in node.body:
+                self.visit(r)
+
+            self.scope.branch = branch.create_orelse()
+            for r in node.orelse:
+                self.visit(r)
+
+            self.scope.branch = oldbranch
 
     def visit_While(self, node):
         with self.loop((node.lineno, node.col_offset), self.get_expr_end(node)):

supplement/names.py

@@ -354,7 +354,7 @@ def visit_ImportFrom(self, node):
     def visit_Import(self, node):
         for n in node.names:
             if n.asname:
-                self.names[n.asname] = ModuleName, n.name
+                self.add_name(n.asname, (ModuleName, n.name, set()), node.lineno)
             else:
                 name, _, tail = n.name.partition('.')
                 self.add_name(name, (ModuleName, name, set()), node.lineno)

tests/test_assist.py

@@ -65,6 +65,18 @@ def test_assist_for_relative_star_imported_names(project):
 
     assert result == ['test']
 
+def test_assist_for_import_as(project):
+    project.create_module('toimport', '''
+        test = 1
+    ''')
+
+    result = do_assist(project, '''
+        import toimport as foo
+        foo.te''')
+
+    assert result == ['test']
+
+
 def test_assist_for_function_names(project):
     result = do_assist(project, '''
         test1 = 1

tests/test_linter.py

@@ -235,3 +235,19 @@ def foo():
             $result$ = lambda boo, bar: boo + bar
     ''')
 
+def test_lambda_assigned_to_var():
+    assert_names('''
+        from __future__ import absolute_import
+    ''')
+
+def test_for_loop_alt_logic_branches():
+    assert_names('''
+        def foo():
+            for _ in []:
+                bar = 1
+                break
+            else:
+                bar = 2
+
+            print bar
+    ''')