From d3af6344ef43df20c91be8275a5e874dc0589830 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Thu, 5 Apr 2012 22:59:13 -0400 Subject: #14492: fix some bugs in Tools/scripts/pdeps.py. Initial patch by Popa Claudiu. --- Tools/scripts/pdeps.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Tools') diff --git a/Tools/scripts/pdeps.py b/Tools/scripts/pdeps.py index 938f31c164..f8218ac524 100755 --- a/Tools/scripts/pdeps.py +++ b/Tools/scripts/pdeps.py @@ -76,10 +76,9 @@ def process(filename, table): nextline = fp.readline() if not nextline: break line = line[:-1] + nextline - if m_import.match(line) >= 0: - (a, b), (a1, b1) = m_import.regs[:2] - elif m_from.match(line) >= 0: - (a, b), (a1, b1) = m_from.regs[:2] + m_found = m_import.match(line) or m_from.match(line) + if m_found: + (a, b), (a1, b1) = m_found.regs[:2] else: continue words = line[a1:b1].split(',') # print '#', line, words @@ -87,6 +86,7 @@ def process(filename, table): word = word.strip() if word not in list: list.append(word) + fp.close() # Compute closure (this is in fact totally general) @@ -123,7 +123,7 @@ def closure(table): def inverse(table): inv = {} for key in table.keys(): - if not inv.has_key(key): + if key not in inv: inv[key] = [] for item in table[key]: store(inv, item, key) -- cgit v1.2.1