diff options
| author | Georg Brandl <georg@python.org> | 2008-05-16 17:02:34 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-05-16 17:02:34 (GMT) |
| commit | bf82e374ee737992235cbe944c9ddbd58236a892 (patch) | |
| tree | f8c8dccaa76d58f9cb7d8cc0abb1355be75ee369 /Tools/freeze | |
| parent | acbca71ea775fc488bead0876d0cdbd48670dcbc (diff) | |
| download | cpython-bf82e374ee737992235cbe944c9ddbd58236a892.zip cpython-bf82e374ee737992235cbe944c9ddbd58236a892.tar.gz cpython-bf82e374ee737992235cbe944c9ddbd58236a892.tar.bz2 | |
More 2to3 fixes in the Tools directory. Fixes #2893.
Diffstat (limited to 'Tools/freeze')
| -rw-r--r-- | Tools/freeze/checkextensions.py | 6 | ||||
| -rwxr-xr-x | Tools/freeze/freeze.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Tools/freeze/checkextensions.py b/Tools/freeze/checkextensions.py index 334521f..c18af78 100644 --- a/Tools/freeze/checkextensions.py +++ b/Tools/freeze/checkextensions.py @@ -18,7 +18,7 @@ def checkextensions(unknown, extensions): for mod in unknown: for e in extensions: (mods, vars), liba = edict[e] - if not mods.has_key(mod): + if mod not in mods: continue modules.append(mod) if liba: @@ -28,7 +28,7 @@ def checkextensions(unknown, extensions): if liba in files: break files.append(liba) - for m in mods.keys(): + for m in list(mods.keys()): files = files + select(e, mods, vars, m, 1) break @@ -84,7 +84,7 @@ def expandvars(str, vars): break var = str[i:j] i = j+1 - if vars.has_key(var): + if var in vars: str = str[:k] + vars[var] + str[i:] i = k return str diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py index d1e024f..a7673c9 100755 --- a/Tools/freeze/freeze.py +++ b/Tools/freeze/freeze.py @@ -460,7 +460,7 @@ def main(): somevars = {} if os.path.exists(makefile_in): makevars = parsesetup.getmakevars(makefile_in) - for key in makevars.keys(): + for key in makevars: somevars[key] = makevars[key] somevars['CFLAGS'] = ' '.join(cflags) # override |