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

Fix some Python3 stragglers, so flawfinder runs on Python 2 or 3 

Signed-off-by: David A. Wheeler <dwheeler@dwheeler.com>
This commit is contained in:
David A. Wheeler 2017-08-23 22:01:34 -04:00
parent cdea1a214a
commit 57929a1c60
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flawfinder
View File

@ -217,7 +217,7 @@ def svn_diff_get_filename(sLine):
def gnu_diff_get_filename(sLine): def gnu_diff_get_filename(sLine):
newfile_match = diff_newfile.match(sLine) newfile_match = diff_newfile.match(sLine)
if newfile_match: if newfile_match:
patched_filename = string.strip(newfile_match.group('filename')) patched_filename = newfile_match.group('filename').strip()
# Clean up filename - remove trailing timestamp and/or (comment). # Clean up filename - remove trailing timestamp and/or (comment).
return diff_findjunk.match(patched_filename) return diff_findjunk.match(patched_filename)
return None return None
@ -265,7 +265,7 @@ def load_patch_info(input_patch_file):
# because Python forbids '=' in conditions, we do it this way. # because Python forbids '=' in conditions, we do it this way.
filename_match = fn_get_filename(sLine) filename_match = fn_get_filename(sLine)
if filename_match: if filename_match:
patched_filename = string.strip(filename_match.group('filename')) patched_filename = filename_match.group('filename').strip()
if patched_filename in patch: if patched_filename in patch:
error("filename occurs more than once in the patch: %s" % error("filename occurs more than once in the patch: %s" %
patched_filename) patched_filename)
@ -1705,7 +1705,7 @@ def maybe_process_file(f, patch_infos):
# THEN check if it's a regular file or symlink. This is more complicated, # THEN check if it's a regular file or symlink. This is more complicated,
# but I do it this way so that there won't be a lot of pointless # but I do it this way so that there won't be a lot of pointless
# warnings about skipping files we wouldn't have used anyway. # warnings about skipping files we wouldn't have used anyway.
dotposition = string.rfind(f, ".") dotposition = f.rfind(".")
if dotposition > 1: if dotposition > 1:
extension = f[dotposition:] extension = f[dotposition:]
if extension in c_extensions: if extension in c_extensions:
@ -1905,7 +1905,7 @@ def process_options():
output_format = 1 output_format = 1
single_line = 0 single_line = 0
elif opt == "--minlevel" or opt == "-m": elif opt == "--minlevel" or opt == "-m":
minimum_level = string.atoi(value) minimum_level = int(value)
elif opt == "--singleline" or opt == "-S": elif opt == "--singleline" or opt == "-S":
single_line = 1 single_line = 1
elif opt == "--csv": elif opt == "--csv":