From cf16bf82b9638a9b5d190309cc25fd0e4cacfebe Mon Sep 17 00:00:00 2001 From: Tarek Ziade Date: Tue, 21 Feb 2012 13:04:01 +0100 Subject: [PATCH] cleanup --- flake8/mccabe.py | 2 +- flake8/pyflakes.py | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/flake8/mccabe.py b/flake8/mccabe.py index ee89ed0..77464b4 100644 --- a/flake8/mccabe.py +++ b/flake8/mccabe.py @@ -46,7 +46,7 @@ class ASTVisitor: """Do preorder walk of tree using visitor""" self.visitor = visitor visitor.visit = self.dispatch - self.dispatch(tree, *args) # XXX *args make sense? + self.dispatch(tree, *args) # XXX *args make sense? class PathNode: diff --git a/flake8/pyflakes.py b/flake8/pyflakes.py index dfdef9e..25245d3 100644 --- a/flake8/pyflakes.py +++ b/flake8/pyflakes.py @@ -3,13 +3,12 @@ # See LICENSE file for details try: - import __builtin__ + import __builtin__ # NOQA except ImportError: import builtins as __builtin__ import os.path import _ast -import sys from flake8 import messages from flake8.util import skip_warning @@ -568,14 +567,10 @@ class Checker(object): Check to see if any assignments have not been used. """ for name, binding in self.scope.items(): - try: - if (not binding.used and not name in self.scope.globals + if (not binding.used and not name in self.scope.globals and isinstance(binding, Assignment)): - self.report(messages.UnusedVariable, - binding.source.lineno, name) - except: - raise Exception(binding) - import pdb; pdb.set_trace() + self.report(messages.UnusedVariable, + binding.source.lineno, name) self.deferAssignment(checkUnusedAssignments) self.popScope()