@@ -159,7 +159,14 @@ class Checker(ast.NodeVisitor): self.visit_nodes(node.body + node.orelse) def visit_FunctionDef(self, node): - self.visit_nodes(node.decorators) + + try: + decorators = node.decorator_list + except AttributeError: + # Use .decorators for Python 2.5 compatibility + decorators = node.decorators + + self.visit_nodes(decorators) self.add_binding(node, FunctionDefinition(node.name, node)) self.visit_Lambda(node) @@ -307,6 +314,7 @@ class Checker(ast.NodeVisitor): self.assign_vars(node.name) self.visit_nodes(node.body) + visit_ExceptHandler = visit_excepthandler # in 2.6, this was CamelCased def flatten(self, nodes): if isinstance(nodes, ast.Attribute): pyflakes/checker.py 86ab7533aa6553a859e672fe25617d186272e4c2 Kevin Watters kevinwatters@gmail.com http://github.com/kevinw/pyflakes/commit/5d93ff0d0cb6e8190505f1a4fcfa220eb62dbdee 5d93ff0d0cb6e8190505f1a4fcfa220eb62dbdee 2009-03-12T16:36:33-07:00 2009-03-12T16:36:33-07:00 Include compatibility fixes for Python 2.6's _ast changes in visit_FunctionDef and for visit_ExceptHandler. Thanks Herve Cauwelier. 5ad6c17162ced054ca45d907b9d8b86775cf3524 Kevin Watters kevinwatters@gmail.com