Merge lp:~pyflakes-dev/pyflakes/1112067-comprehension-scope into lp:pyflakes

[Florent]

Fixes the case for generator expressions / dict comprehensions / set comprehensions

[lp:~pyflakes-dev/pyflakes/1112067-comprehension-scope]

69. By Florent on 2013-03-06

Do not report redefinition of variable for a variable used in a list comprehension in a conditional

=== modified file 'NEWS.txt'
--- NEWS.txt	2013-02-08 00:59:13 +0000
+++ NEWS.txt	2013-03-06 22:41:21 +0000
@@ -1,7 +1,16 @@
-0.6.x (unreleased):
-  - Do not report redefinition of variable for generator expressions and
-    set or dict comprehensions.
-
+<<<<<<< TREE
+0.6.x (unreleased):
+  - Do not report redefinition of variable for generator expressions and
+    set or dict comprehensions.
+
+=======
+0.6.x (unreleased):
+  - Do not report redefinition of variable for a variable used in a list
+    comprehension in a conditional.
+  - Do not report redefinition of variable for generator expressions and
+    set or dict comprehensions.
+
+>>>>>>> MERGE-SOURCE
 0.6.1 (2013-01-29):
   - Fix detection of variables in augmented assignments.
 
 
=== modified file 'pyflakes/checker.py'
--- pyflakes/checker.py	2013-02-21 16:40:37 +0000
+++ pyflakes/checker.py	2013-03-06 22:41:21 +0000
@@ -368,7 +368,8 @@
         existing = self.scope.get(value.name)
         if not redefinedWhileUnused and self.hasParent(value.source, ast.ListComp):
             if (existing and reportRedef
-                    and not self.hasParent(existing.source, (ast.For, ast.ListComp))):
+                    and not self.hasParent(existing.source, (ast.For, ast.ListComp))
+                    and not self.differentForks(node, existing.source)):
                 self.report(messages.RedefinedInListComp,
                             node.lineno, value.name, existing.source.lineno)
 
 
=== modified file 'pyflakes/test/test_other.py'
--- pyflakes/test/test_other.py	2013-02-08 00:59:13 +0000
+++ pyflakes/test/test_other.py	2013-03-06 22:41:21 +0000
@@ -213,6 +213,31 @@
             pass
         ''', m.RedefinedWhileUnused)
 
+    def test_redefinedIfElseInListComp(self):
+        """
+        Test that shadowing a variable in a list comprehension in
+        an if and else block does not raise a warning.
+        """
+        self.flakes('''
+        if False:
+            a = 1
+        else:
+            [a for a in '12']
+        ''')
+
+    def test_redefinedElseInListComp(self):
+        """
+        Test that shadowing a variable in a list comprehension in
+        an else (or if) block raises a warning.
+        """
+        self.flakes('''
+        if False:
+            pass
+        else:
+            a = 1
+            [a for a in '12']
+        ''', m.RedefinedInListComp)
+
     def test_functionDecorator(self):
         """
         Test that shadowing a function definition with a decorated version of