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

Remove some Python 2/3 inconsistencies 

Signed-off-by: David A. Wheeler <dwheeler@dwheeler.com>
This commit is contained in:
David A. Wheeler 2017-08-12 20:38:50 -04:00
parent 6bb9c5d3c7
commit 0f4deebe00
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flawfinder
View File

@ -396,7 +396,7 @@ class Hit(object):
self.line = 0
self.name = ""
self.context_text = ""
for key in other.keys():
for key in other:
setattr(self, key, other[key])
def __getitem__(self, X): # Define this so this works: "%(line)" % hit
@ -1595,8 +1595,9 @@ def expand_ruleset(ruleset):
# Rulesets can have compressed sets of rules
# (multiple function names separated by "|".
# Expand the given ruleset.
# Note that this for loop modifies the ruleset while it's iterating!
for rule in ruleset.keys():
# Note that this "for" loop modifies the ruleset while it's iterating,
# so we *must* convert the keys into a list before iterating.
for rule in list(ruleset.keys()):
if string.find(rule, "|") != -1: # We found a rule to expand.
for newrule in string.split(rule, "|"):
if newrule in ruleset:
@ -1964,7 +1965,8 @@ def process_options():
# will expand twice. Python doesn't have a clean way to detect
# "has globbing occurred", so this is the best I've found:
if os.name == "windows" or os.name == "nt" or os.name == "dos":
sys.argv[1:] = functools.reduce(operator.add, map(glob.glob, args))
sys.argv[1:] = functools.reduce(operator.add,
list(map(glob.glob, args)))
else:
sys.argv[1:] = args
# In Python 2 the convention is "getopt.GetoptError", but we