--- a/VultureChecker/VultureCheckerService.py Sat Mar 31 13:04:21 2018 +0200 +++ b/VultureChecker/VultureCheckerService.py Sun Nov 25 12:44:16 2018 +0100 @@ -183,10 +183,12 @@ @rtype dict """ d = { - "name": str(item), - "type": getattr(item, "typ", ""), - "file": getattr(item, "filename", ""), - "line": getattr(item, "lineno", ""), + "name": item.name, + "type": item.typ, + "file": item.filename, + "first_line": item.first_lineno, + "last_line": item.last_lineno, + "confidence": item.confidence, } return d @@ -200,20 +202,18 @@ return { "DefinedAttributes": [self.__item2Dict(i) for i in self.defined_attrs], + "DefinedClasses": + [self.__item2Dict(i) for i in self.defined_classes], "DefinedFunctions": [self.__item2Dict(i) for i in self.defined_funcs], + "DefinedImports": + [self.__item2Dict(i) for i in self.defined_imports], "DefinedSlots": [self.__item2Dict(i) for i in self.defined_slots], "DefinedProperties": [self.__item2Dict(i) for i in self.defined_props], "DefinedVariables": [self.__item2Dict(i) for i in self.defined_vars], - "UsedAttributes": - [self.__item2Dict(i) for i in self.used_attrs], - "UsedVariables": - [self.__item2Dict(i) for i in self.used_vars], - "TupleVariables": - [self.__item2Dict(i) for i in self.tuple_assign_vars], - "Aliases": - [self.__item2Dict(i) for i in self.names_imported_as_aliases], + "UsedAttributes": list(self.used_attrs), + "UsedNames": list(self.used_names), }