starting a py2/py3 compatible version

This commit is contained in:
Tarek Ziade 2012-02-14 21:15:54 +01:00
parent e3b33db104
commit aa4a855c38
2 changed files with 46 additions and 27 deletions

View file

@ -3,7 +3,13 @@
http://nedbatchelder.com/blog/200803/python_code_complexity_microtool.html http://nedbatchelder.com/blog/200803/python_code_complexity_microtool.html
MIT License. MIT License.
""" """
import compiler try:
from compiler.visitor import ASTVisitor as Visitor
from compiler import parse
except ImportError:
from ast import NodeVisitor as Visitor
from ast import parse
import optparse import optparse
import sys import sys
@ -14,8 +20,8 @@ class PathNode:
self.look = look self.look = look
def to_dot(self): def to_dot(self):
print 'node [shape=%s,label="%s"] %d;' % \ print('node [shape=%s,label="%s"] %d;' % \
(self.look, self.name, self.dot_id()) (self.look, self.name, self.dot_id()))
def dot_id(self): def dot_id(self):
return id(self) return id(self)
@ -36,13 +42,13 @@ class PathGraph:
self.nodes.setdefault(n1, []).append(n2) self.nodes.setdefault(n1, []).append(n2)
def to_dot(self): def to_dot(self):
print 'subgraph {' print('subgraph {')
for node in self.nodes: for node in self.nodes:
node.to_dot() node.to_dot()
for node, nexts in self.nodes.items(): for node, nexts in self.nodes.items():
for next in nexts: for next in nexts:
print '%s -- %s;' % (node.dot_id(), next.dot_id()) print('%s -- %s;' % (node.dot_id(), next.dot_id()))
print '}' print('}')
def complexity(self): def complexity(self):
""" Return the McCabe complexity for the graph. """ Return the McCabe complexity for the graph.
@ -53,13 +59,13 @@ class PathGraph:
return num_edges - num_nodes + 2 return num_edges - num_nodes + 2
class PathGraphingAstVisitor(compiler.visitor.ASTVisitor): class PathGraphingAstVisitor(Visitor):
""" A visitor for a parsed Abstract Syntax Tree which finds executable """ A visitor for a parsed Abstract Syntax Tree which finds executable
statements. statements.
""" """
def __init__(self): def __init__(self):
compiler.visitor.ASTVisitor.__init__(self) Visitor.__init__(self)
self.classname = "" self.classname = ""
self.graphs = {} self.graphs = {}
self.reset() self.reset()
@ -175,9 +181,9 @@ class PathGraphingAstVisitor(compiler.visitor.ASTVisitor):
def get_code_complexity(code, min=7, filename='stdin'): def get_code_complexity(code, min=7, filename='stdin'):
complex = [] complex = []
try: try:
ast = compiler.parse(code) ast = parse(code)
except AttributeError as e: except AttributeError as e:
print >> sys.stderr, "Unable to parse %s: %s" % (filename, e) sys.stderr.write("Unable to parse %s: %s\n" % (filename, e))
return 0 return 0
visitor = PathGraphingAstVisitor() visitor = PathGraphingAstVisitor()
@ -215,20 +221,20 @@ def main(argv):
options, args = opar.parse_args(argv) options, args = opar.parse_args(argv)
text = open(args[0], "rU").read() + '\n\n' text = open(args[0], "rU").read() + '\n\n'
ast = compiler.parse(text) ast = parse(text)
visitor = PathGraphingAstVisitor() visitor = PathGraphingAstVisitor()
visitor.preorder(ast, visitor) visitor.preorder(ast, visitor)
if options.dot: if options.dot:
print 'graph {' print('graph {')
for graph in visitor.graphs.values(): for graph in visitor.graphs.values():
if graph.complexity() >= options.min: if graph.complexity() >= options.min:
graph.to_dot() graph.to_dot()
print '}' print('}')
else: else:
for graph in visitor.graphs.values(): for graph in visitor.graphs.values():
if graph.complexity() >= options.min: if graph.complexity() >= options.min:
print graph.name, graph.complexity() print(graph.name, graph.complexity())
if __name__ == '__main__': if __name__ == '__main__':

View file

@ -2,7 +2,11 @@
# (c) 2005-2010 Divmod, Inc. # (c) 2005-2010 Divmod, Inc.
# See LICENSE file for details # See LICENSE file for details
import __builtin__ try:
import __builtin__
except ImportError:
import builtins as __builtin__
import os.path import os.path
import _ast import _ast
import sys import sys
@ -251,7 +255,7 @@ class Checker(object):
all = [] all = []
# Look for imported names that aren't used. # Look for imported names that aren't used.
for importation in scope.itervalues(): for importation in scope.values():
if isinstance(importation, Importation): if isinstance(importation, Importation):
if not importation.used and importation.name not in all: if not importation.used and importation.name not in all:
self.report( self.report(
@ -284,7 +288,7 @@ class Checker(object):
def handleNode(self, node, parent): def handleNode(self, node, parent):
node.parent = parent node.parent = parent
if self.traceTree: if self.traceTree:
print ' ' * self.nodeDepth + node.__class__.__name__ print(' ' * self.nodeDepth + node.__class__.__name__)
self.nodeDepth += 1 self.nodeDepth += 1
if self.futuresAllowed and not \ if self.futuresAllowed and not \
(isinstance(node, _ast.ImportFrom) or self.isDocstring(node)): (isinstance(node, _ast.ImportFrom) or self.isDocstring(node)):
@ -296,7 +300,7 @@ class Checker(object):
finally: finally:
self.nodeDepth -= 1 self.nodeDepth -= 1
if self.traceTree: if self.traceTree:
print ' ' * self.nodeDepth + 'end ' + node.__class__.__name__ print (' ' * self.nodeDepth + 'end ' + node.__class__.__name__)
def ignore(self, node): def ignore(self, node):
pass pass
@ -527,10 +531,15 @@ class Checker(object):
if isinstance(arg, _ast.Tuple): if isinstance(arg, _ast.Tuple):
addArgs(arg.elts) addArgs(arg.elts)
else: else:
if arg.id in args: try:
id_ = arg.id
except AttributeError:
id_ = arg.arg
if id_ in args:
self.report(messages.DuplicateArgument, self.report(messages.DuplicateArgument,
node.lineno, arg.id) node.lineno, id_)
args.append(arg.id) args.append(id_)
self.pushFunctionScope() self.pushFunctionScope()
addArgs(node.args.args) addArgs(node.args.args)
@ -554,7 +563,7 @@ class Checker(object):
""" """
Check to see if any assignments have not been used. Check to see if any assignments have not been used.
""" """
for name, binding in self.scope.iteritems(): for name, binding in self.scope.items():
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)): and isinstance(binding, Assignment)):
self.report(messages.UnusedVariable, self.report(messages.UnusedVariable,
@ -629,8 +638,9 @@ def checkPath(filename):
@return: the number of warnings printed @return: the number of warnings printed
""" """
try: try:
return check(file(filename, 'U').read() + '\n', filename) return check(open(filename, 'U').read() + '\n', filename)
except IOError, msg: except IOError:
msg = sys.exc_info()[1]
print >> sys.stderr, "%s: %s" % (filename, msg.args[1]) print >> sys.stderr, "%s: %s" % (filename, msg.args[1])
return 1 return 1
@ -652,7 +662,8 @@ def check(codeString, filename):
# First, compile into an AST and handle syntax errors. # First, compile into an AST and handle syntax errors.
try: try:
tree = compile(codeString, filename, "exec", _ast.PyCF_ONLY_AST) tree = compile(codeString, filename, "exec", _ast.PyCF_ONLY_AST)
except SyntaxError, value: except SyntaxError:
value = sys.exc_info()[1]
msg = value.args[0] msg = value.args[0]
(lineno, offset, text) = value.lineno, value.offset, value.text (lineno, offset, text) = value.lineno, value.offset, value.text
@ -679,13 +690,15 @@ def check(codeString, filename):
else: else:
# Okay, it's syntactically valid. Now check it. # Okay, it's syntactically valid. Now check it.
w = Checker(tree, filename) w = Checker(tree, filename)
w.messages.sort(lambda a, b: cmp(a.lineno, b.lineno)) sorting = [(msg.lineno, msg) for msg in w.messages]
sorting.sort()
w.messages = [msg for index, msg in sorting]
valid_warnings = 0 valid_warnings = 0
for warning in w.messages: for warning in w.messages:
if skip_warning(warning): if skip_warning(warning):
continue continue
print warning print(warning)
valid_warnings += 1 valid_warnings += 1
return valid_warnings return valid_warnings