From 6c00b1141fdfa7d168a9b82e6ab493c77f7c1621 Mon Sep 17 00:00:00 2001 From: Jarrod Millman Date: Wed, 28 Nov 2007 05:12:37 +0000 Subject: use 'in' keyword to test dictionary membership --- numpy/f2py/use_rules.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'numpy/f2py/use_rules.py') diff --git a/numpy/f2py/use_rules.py b/numpy/f2py/use_rules.py index 4c24fd728..25e52df0b 100644 --- a/numpy/f2py/use_rules.py +++ b/numpy/f2py/use_rules.py @@ -61,15 +61,15 @@ def buildusevars(m,r): outmess('\t\tBuilding use variable hooks for module "%s" (feature only for F90/F95)...\n'%(m['name'])) varsmap={} revmap={} - if r.has_key('map'): + if 'map' in r: for k in r['map'].keys(): - if revmap.has_key(r['map'][k]): + if r['map'][k] in revmap: outmess('\t\t\tVariable "%s<=%s" is already mapped by "%s". Skipping.\n'%(r['map'][k],k,revmap[r['map'][k]])) else: revmap[r['map'][k]]=k - if r.has_key('only') and r['only']: + if 'only' in r and r['only']: for v in r['map'].keys(): - if m['vars'].has_key(r['map'][v]): + if r['map'][v] in m['vars']: if revmap[r['map'][v]]==v: varsmap[v]=r['map'][v] @@ -79,7 +79,7 @@ def buildusevars(m,r): outmess('\t\t\tNo definition for variable "%s=>%s". Skipping.\n'%(v,r['map'][v])) else: for v in m['vars'].keys(): - if revmap.has_key(v): + if v in revmap: varsmap[v]=revmap[v] else: varsmap[v]=v -- cgit v1.2.1