walkero
/
flawfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Remove use of Python 2-only __cmp__ 

Remove use of __cmp__, which is in Python 2 but not in Python 3.
Instead, use sort keys, which work in Python 2 and 3.

Signed-off-by: David A. Wheeler <dwheeler@dwheeler.com>
This commit is contained in:
David A. Wheeler 2017-08-12 20:31:41 -04:00
parent ea67f5dbca
commit eb3631d839
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
flawfinder
View File

@ -399,12 +399,6 @@ class Hit(object):
for key in other.keys(): for key in other.keys():
setattr(self, key, other[key]) setattr(self, key, other[key])
def __cmp__(self, other):
return (cmp(other.level, self.level) or # Highest risk first.
cmp(self.filename, other.filename) or
cmp(self.line, other.line) or
cmp(self.column, other.column) or cmp(self.name, other.name))
def __getitem__(self, X): # Define this so this works: "%(line)" % hit def __getitem__(self, X): # Define this so this works: "%(line)" % hit
return getattr(self, X) return getattr(self, X)
@ -1999,6 +1993,9 @@ def process_files():
process_file_args(files, patch_infos) process_file_args(files, patch_infos)
return 1 return 1
def hitlist_sort_key(hit):
"""Sort key for hitlist."""
return (-hit.level, hit.filename, hit.line, hit.column, hit.name)
def show_final_results(): def show_final_results():
global hitlist global hitlist
@ -2017,7 +2014,7 @@ def show_final_results():
else: else:
print("FINAL RESULTS:") print("FINAL RESULTS:")
print() print()
hitlist.sort() hitlist.sort(key=hitlist_sort_key)
# Display results. The HTML format now uses # Display results. The HTML format now uses
# <ul> so that the format differentiates each entry. # <ul> so that the format differentiates each entry.
# I'm not using <ol>, because its numbers might be confused with # I'm not using <ol>, because its numbers might be confused with