More 2to3 fixes in the Tools directory. Fixes #2893.
diff --git a/Tools/i18n/makelocalealias.py b/Tools/i18n/makelocalealias.py
index f97b80e..45876c1 100644
--- a/Tools/i18n/makelocalealias.py
+++ b/Tools/i18n/makelocalealias.py
@@ -45,18 +45,14 @@
return data
def pprint(data):
-
- items = data.items()
- items.sort()
- for k,v in items:
+ items = sorted(data.items())
+ for k, v in items:
print(' %-40s%r,' % ('%r:' % k, v))
def print_differences(data, olddata):
-
- items = olddata.items()
- items.sort()
+ items = sorted(olddata.items())
for k, v in items:
- if not data.has_key(k):
+ if k not in data:
print('# removed %r' % k)
elif olddata[k] != data[k]:
print('# updated %r -> %r to %r' % \
diff --git a/Tools/i18n/msgfmt.py b/Tools/i18n/msgfmt.py
index f4466b4..860e4ea 100755
--- a/Tools/i18n/msgfmt.py
+++ b/Tools/i18n/msgfmt.py
@@ -56,9 +56,8 @@
def generate():
"Return the generated output."
global MESSAGES
- keys = MESSAGES.keys()
# the keys are sorted in the .mo file
- keys.sort()
+ keys = sorted(MESSAGES.keys())
offsets = []
ids = strs = ''
for id in keys:
diff --git a/Tools/i18n/pygettext.py b/Tools/i18n/pygettext.py
index 4f0866e..d4ea597 100755
--- a/Tools/i18n/pygettext.py
+++ b/Tools/i18n/pygettext.py
@@ -265,7 +265,7 @@
def _visit_pyfiles(list, dirname, names):
"""Helper for getFilesForName()."""
# get extension for python source files
- if not globals().has_key('_py_ext'):
+ if '_py_ext' not in globals():
global _py_ext
_py_ext = [triple[0] for triple in imp.get_suffixes()
if triple[2] == imp.PY_SOURCE][0]