More 2to3 fixes in the Tools directory. Fixes #2893.
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 @@
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 @@
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 @@
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 @@
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