From cd1467383450613b0d63d5679afdd95c85a600d8 Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Tue, 16 Jun 2015 17:03:32 +0200 Subject: [PATCH] Avoid unnecessary growth of python lists The path argument of checkProg* was added to the PATH list in a nested loop such that the list doubles in size each time the loop is executed, thus also slowing down detection of missing programs. --- lib/configure.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/configure.py b/lib/configure.py index 9c6070ad81..93ed5fd63c 100644 --- a/lib/configure.py +++ b/lib/configure.py @@ -250,6 +250,11 @@ def checkProg(description, progs, rc_entry = [], path = [], not_found = ''): sys.exit(2) logger.info('checking for ' + description + '...') ## print '(' + ','.join(progs) + ')', + additional_path = path + path = os.environ["PATH"].split(os.pathsep) + additional_path + extlist = [''] + if "PATHEXT" in os.environ: + extlist = extlist + os.environ["PATHEXT"].split(os.pathsep) global java, perl for idx in range(len(progs)): # ac_prog may have options, ac_word is the command name @@ -260,10 +265,6 @@ def checkProg(description, progs, rc_entry = [], path = [], not_found = ''): if ac_word.endswith('.pl') and perl == '': continue msg = '+checking for "' + ac_word + '"... ' - path = os.environ["PATH"].split(os.pathsep) + path - extlist = [''] - if "PATHEXT" in os.environ: - extlist = extlist + os.environ["PATHEXT"].split(os.pathsep) for ac_dir in path: if hasattr(os, "access") and not os.access(ac_dir, os.F_OK): continue @@ -302,6 +303,11 @@ def checkProgAlternatives(description, progs, rc_entry = [], alt_rc_entry = [], sys.exit(2) logger.info('checking for ' + description + '...') ## print '(' + ','.join(progs) + ')', + additional_path = path + path = os.environ["PATH"].split(os.pathsep) + additional_path + extlist = [''] + if "PATHEXT" in os.environ: + extlist = extlist + os.environ["PATHEXT"].split(os.pathsep) found_prime = False real_ac_dir = '' real_ac_word = not_found @@ -315,10 +321,6 @@ def checkProgAlternatives(description, progs, rc_entry = [], alt_rc_entry = [], if ac_word.endswith('.pl') and perl == '': continue msg = '+checking for "' + ac_word + '"... ' - path = os.environ["PATH"].split(os.pathsep) + path - extlist = [''] - if "PATHEXT" in os.environ: - extlist = extlist + os.environ["PATHEXT"].split(os.pathsep) found_alt = False for ac_dir in path: if hasattr(os, "access") and not os.access(ac_dir, os.F_OK): -- 2.39.2