diff -r 0063e49e772f -r e19e7622a428 VultureChecker/VultureCheckerService.py --- a/VultureChecker/VultureCheckerService.py Fri Oct 09 19:00:49 2015 +0200 +++ b/VultureChecker/VultureCheckerService.py Sun Oct 11 19:29:38 2015 +0200 @@ -14,8 +14,6 @@ except NameError: pass -import ast - import multiprocessing import sys @@ -119,11 +117,11 @@ output.put((filename, result)) -def __analyze(file, text=""): +def __analyze(filename, text=""): """ Private function to analyze one Python file. - @param file source file name + @param filename source file name @type str @param text source text @type str @@ -138,8 +136,8 @@ pass try: - v = EricVulture(file) - v.scan(text) + v = EricVulture() + v.scan(text, filename=filename) res = v.getResults() except Exception as err: res = {"error": str(err)} @@ -150,29 +148,6 @@ """ Class to adopt the Vulture class to the eric plug-in functionality. """ - def __init__(self, filename): - """ - Constructor - - @param filename source file name - @type str - """ - super(EricVulture, self).__init__() - - self.file = filename - self.code = None - - def scan(self, source): - """ - Public method to scan the source text. - - @param source source text - @type str - """ - self.code = source.splitlines() - node = ast.parse(source, filename=self.file) - self.visit(node) - def __item2Dict(self, item): """ Private method to convert a vulture item to a dictionary. @@ -185,7 +160,7 @@ d = { "name": str(item), "type": getattr(item, "typ", ""), - "file": getattr(item, "file", ""), + "file": getattr(item, "filename", ""), "line": getattr(item, "lineno", ""), } return d