Merge lp:~pyflakes-dev/pyflakes/0.6-del-import into lp:pyflakes

[Florent]

Ready.

=== modified file 'NEWS.txt'
--- NEWS.txt	2013-04-02 17:33:38 +0000
+++ NEWS.txt	2013-04-04 07:36:27 +0000
@@ -6,9 +6,14 @@
     comprehension in a conditional.
   - Do not report redefinition of variable for generator expressions and
     set or dict comprehensions.
+<<<<<<< TREE
   - Do not report undefined name when the code is protected with a
     `NameError` exception handler.
   - Fix issue with Turkish locale where `'i'.upper() == 'i'` in Python 2.
+=======
+  - Do not report redefinition of variable when unassigning a module imported
+    for its side-effect.
+>>>>>>> MERGE-SOURCE
 
 0.6.1 (2013-01-29):
   - Fix detection of variables in augmented assignments.

=== modified file 'pyflakes/checker.py'
--- pyflakes/checker.py	2013-04-02 17:33:38 +0000
+++ pyflakes/checker.py	2013-04-04 07:36:27 +0000
@@ -82,10 +82,6 @@
                                                         id(self))
 
 
-class UnBinding(Binding):
-    """Created by the 'del' operator."""
-
-
 class Importation(Binding):
     """
     A binding created by an import statement.
@@ -387,6 +383,7 @@
                 self.report(messages.RedefinedInListComp,
                             node, value.name, existing.source)
 
+<<<<<<< TREE
         if isinstance(value, UnBinding):
             try:
                 del self.scope[value.name]
@@ -395,6 +392,11 @@
         elif (isinstance(existing, Definition)
               and not existing.used
               and not self.differentForks(node, existing.source)):
+=======
+        if (isinstance(existing, Definition)
+                and not existing.used
+                and not self.differentForks(node, existing.source)):
+>>>>>>> MERGE-SOURCE
             self.report(messages.RedefinedWhileUnused,
                         node, value.name, existing.source)
         else:
@@ -491,7 +493,10 @@
         if isinstance(self.scope, FunctionScope) and name in self.scope.globals:
             self.scope.globals.remove(name)
         else:
-            self.addBinding(node, UnBinding(name, node))
+            try:
+                del self.scope[name]
+            except KeyError:
+                self.report(messages.UndefinedName, node.lineno, name)
 
     def handleChildren(self, tree):
         for node in iter_child_nodes(tree):

=== modified file 'pyflakes/test/test_imports.py'
--- pyflakes/test/test_imports.py	2013-03-30 23:47:50 +0000
+++ pyflakes/test/test_imports.py	2013-04-04 07:36:27 +0000
@@ -19,10 +19,10 @@
     def test_usedImport(self):
         self.flakes('import fu; print(fu)')
         self.flakes('from baz import fu; print(fu)')
+        self.flakes('import fu; del fu')
 
     def test_redefinedWhileUnused(self):
         self.flakes('import fu; fu = 3', m.RedefinedWhileUnused)
-        self.flakes('import fu; del fu', m.RedefinedWhileUnused)
         self.flakes('import fu; fu, bar = 3', m.RedefinedWhileUnused)
         self.flakes('import fu; [fu, bar] = 3', m.RedefinedWhileUnused)