diff -r 46783c4f7187 -r 1ce891a2b3ae VultureChecker/VultureCheckerService.py --- a/VultureChecker/VultureCheckerService.py Wed Oct 07 19:17:49 2015 +0200 +++ b/VultureChecker/VultureCheckerService.py Wed Oct 07 19:21:32 2015 +0200 @@ -130,7 +130,6 @@ @return tuple containing the result dictionary @rtype (tuple of dict) """ - # Check type for py2: if not str it's unicode if sys.version_info[0] == 2: try: @@ -187,7 +186,7 @@ "name": str(item), "type": getattr(item, "typ", ""), "file": getattr(item, "file", ""), - "line": getattr(item, "lineno", ""), + "line": getattr(item, "lineno", ""), } return d @@ -199,22 +198,22 @@ @rtype dict """ return { - "DefinedAttributes": + "DefinedAttributes": [self.__item2Dict(i) for i in self.defined_attrs], - "DefinedFunctions": + "DefinedFunctions": [self.__item2Dict(i) for i in self.defined_funcs], - "DefinedSlots": + "DefinedSlots": [self.__item2Dict(i) for i in self.defined_slots], - "DefinedProperties": + "DefinedProperties": [self.__item2Dict(i) for i in self.defined_props], - "DefinedVariables": + "DefinedVariables": [self.__item2Dict(i) for i in self.defined_vars], - "UsedAttributes": + "UsedAttributes": [self.__item2Dict(i) for i in self.used_attrs], - "UsedVariables": + "UsedVariables": [self.__item2Dict(i) for i in self.used_vars], - "TupleVariables": + "TupleVariables": [self.__item2Dict(i) for i in self.tuple_assign_vars], - "Aliases": + "Aliases": [self.__item2Dict(i) for i in self.names_imported_as_aliases], }