Replaced dict.iter* by six.iter*(dict)

iteritems/iterkeys/itervalues do not exist in Python 3 as it's now
the default method used for iteration by items()/keys()/values().

tests/odf_xliff/test_odf_xliff.py

@@ -21,6 +21,7 @@
 import difflib
 import os
 import os.path as path
+import six
 import sys
 import zipfile
 
@@ -44,7 +45,7 @@ def setup_module(module):
 def args(src, tgt, **kwargs):
     arg_list = []
     arg_list.extend([u'--errorlevel=traceback', src, tgt])
-    for flag, value in kwargs.iteritems():
+    for flag, value in six.iteritems(kwargs):
         value = unicode(value)
         if len(flag) == 1:
             arg_list.append(u'-%s' % flag)

translate/convert/convert.py

@@ -22,6 +22,7 @@
 :mod:`translate.convert` tools)."""
 
 import os.path
+import six
 from io import BytesIO
 
 from translate.misc import optrecurse
@@ -123,7 +124,7 @@ def filteroutputoptions(self, options):
         """Filters output options, processing relevant switches in options."""
         if self.usepots and options.pot:
             outputoptions = {}
-            for (inputformat, templateformat), (outputformat, convertor) in self.outputoptions.iteritems():
+            for (inputformat, templateformat), (outputformat, convertor) in six.iteritems(self.outputoptions):
                 inputformat = self.potifyformat(inputformat)
                 templateformat = self.potifyformat(templateformat)
                 outputformat = self.potifyformat(outputformat)

translate/convert/idml2po.py

@@ -20,6 +20,7 @@
 
 """Convert IDML files to PO localization files."""
 
+import six
 from io import BytesIO
 
 from translate.convert import convert
@@ -45,7 +46,7 @@ def convert_idml(inputfile, outputfile, template):
 
     id_maker = IdMaker()  # Create it here to avoid having repeated ids.
 
-    for filename, translatable_file in contents.iteritems():
+    for filename, translatable_file in six.iteritems(contents):
         parse_state = ParseState(NO_TRANSLATE_ELEMENTS, INLINE_ELEMENTS)
         po_store_adder = make_postore_adder(store, id_maker, filename)
         build_idml_store(BytesIO(translatable_file), store, parse_state,

translate/convert/po2idml.py

@@ -23,6 +23,7 @@
 of the PO file.
 """
 
+import six
 from io import BytesIO
 from zipfile import ZIP_DEFLATED, ZipFile
 
@@ -50,7 +51,7 @@ def load_dom_trees(template):
         idml_data = open_idml(template)
         parser = etree.XMLParser(strip_cdata=False)
         return dict((filename, etree.fromstring(data, parser).getroottree())
-                    for filename, data in idml_data.iteritems())
+                    for filename, data in six.iteritems(idml_data))
 
     def load_unit_tree(input_file):
         """Return a dict with the translations grouped by files IDML package.
@@ -122,7 +123,7 @@ def add_node_content(string, node):
 
         make_parse_state = lambda: ParseState(NO_TRANSLATE_ELEMENTS,
                                               INLINE_ELEMENTS)
-        for filename, dom_tree in dom_trees.iteritems():
+        for filename, dom_tree in six.iteritems(dom_trees):
             file_unit_tree = unit_trees[filename]
             apply_translations(dom_tree.getroot(), file_unit_tree,
                                replace_dom_text(make_parse_state,
@@ -143,7 +144,7 @@ def write_idml(template_zip, output_file, dom_trees):
     output_zip = copy_idml(template_zip, output_zip, dom_trees.keys())
 
     # Replace the translated files in the IDML package.
-    for filename, dom_tree in dom_trees.iteritems():
+    for filename, dom_tree in six.iteritems(dom_trees):
         output_zip.writestr(filename, etree.tostring(dom_tree,
                                                      encoding='UTF-8',
                                                      xml_declaration=True,

translate/convert/po2oo.py

@@ -26,6 +26,7 @@
 
 import logging
 import os
+import six
 import time
 
 from translate.convert import convert
@@ -58,7 +59,7 @@ def __init__(self, templatefile, languages=None, timestamp=None, includefuzzy=Fa
     def makeindex(self):
         """makes an index of the oo keys that are used in the source file"""
         self.index = {}
-        for ookey, theoo in self.o.ookeys.iteritems():
+        for ookey, theoo in six.iteritems(self.o.ookeys):
             sourcekey = oo.makekey(ookey, self.long_keys)
             self.index[sourcekey] = theoo
 
@@ -159,7 +160,7 @@ def validelement(self, unit, filename, filteraction):
         filterresult = self.filterunit(unit)
         if filterresult:
             if filterresult != autocorrect:
-                for filtername, filtermessage in filterresult.iteritems():
+                for filtername, filtermessage in six.iteritems(filterresult):
                     location = unit.getlocations()[0].encode('utf-8')
                     if filtername in self.options.error:
                         logger.error("Error at %s::%s: %s",

translate/convert/po2prop.py

@@ -24,6 +24,7 @@
 for examples and usage instructions.
 """
 
+import six
 import warnings
 
 from translate.convert import accesskey, convert
@@ -247,7 +248,7 @@ def main(argv=None):
             default=properties.default_dialect, type="choice",
             choices=properties.dialects.keys(),
             help="override the input file format: %s (for .properties files, default: %s)" %
-                 (", ".join(properties.dialects.iterkeys()),
+                 (", ".join(six.iterkeys(properties.dialects)),
                   properties.default_dialect),
             metavar="TYPE")
     parser.add_option("", "--encoding", dest="encoding", default=None,

translate/convert/po2symb.py

@@ -24,13 +24,15 @@
 for examples and usage instructions.
 """
 
+import six
+
 from translate.storage import factory
 from translate.storage.pypo import po_escape_map
 from translate.storage.symbian import *
 
 
 def escape(text):
-    for key, val in po_escape_map.iteritems():
+    for key, val in six.iteritems(po_escape_map):
         text = text.replace(key, val)
     return '"%s"' % text
 

translate/convert/pot2po.py

@@ -25,6 +25,8 @@
 for examples and usage instructions.
 """
 
+import six
+
 from translate.misc.multistring import multistring
 from translate.search import match
 from translate.storage import catkeys, factory, poheader
@@ -201,7 +203,7 @@ def _do_poheaders(input_store, output_store, template_store):
 
     if template_store is not None and isinstance(template_store, poheader.poheader):
         templateheadervalues = template_store.parseheader()
-        for key, value in templateheadervalues.iteritems():
+        for key, value in six.iteritems(templateheadervalues):
             if key == "Project-Id-Version":
                 project_id_version = value
             elif key == "Last-Translator":
@@ -223,7 +225,7 @@ def _do_poheaders(input_store, output_store, template_store):
                 kwargs[key] = value
 
     inputheadervalues = input_store.parseheader()
-    for key, value in inputheadervalues.iteritems():
+    for key, value in six.iteritems(inputheadervalues):
         if key in ("Project-Id-Version", "Last-Translator", "Language-Team",
                    "PO-Revision-Date", "Content-Type",
                    "Content-Transfer-Encoding", "Plural-Forms"):

translate/convert/prop2po.py

@@ -25,6 +25,7 @@
 """
 
 import logging
+import six
 
 from translate.convert.accesskey import UnitMixer
 from translate.storage import po, properties
@@ -342,7 +343,7 @@ def main(argv=None):
             type="choice",
             choices=properties.dialects.keys(),
             help="override the input file format: %s (for .properties files, default: %s)" %
-                 (", ".join(properties.dialects.iterkeys()),
+                 (", ".join(six.iterkeys(properties.dialects)),
                   properties.default_dialect),
             metavar="TYPE")
     parser.add_option("", "--encoding", dest="encoding", default=None,

translate/convert/test_convert.py

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import os
+import six
 import sys
 
 import pytest
@@ -44,7 +45,7 @@ def run_command(self, *argv, **kwargs):
         argv = list(argv)
         kwoptions = getattr(self, "defaultoptions", {}).copy()
         kwoptions.update(kwargs)
-        for key, value in kwoptions.iteritems():
+        for key, value in six.iteritems(kwoptions):
             if value is True:
                 argv.append("--%s" % key)
             else:

translate/convert/ts2po.py

@@ -24,6 +24,7 @@
 for examples and usage instructions.
 """
 
+import six
 
 from translate.storage import po, ts
 
@@ -56,7 +57,7 @@ def convertfile(self, inputfile):
         tsfile = ts.QtTsParser(inputfile)
         thetargetfile = po.pofile()
 
-        for contextname, messages in tsfile.iteritems():
+        for contextname, messages in six.iteritems(tsfile):
             messagenum = 0
             for message in messages:
                 messagenum += 1

translate/convert/xliff2odf.py

@@ -24,6 +24,7 @@
 for examples and usage instructions.
 """
 
+import six
 import zipfile
 from io import BytesIO
 
@@ -50,7 +51,7 @@ def load_dom_trees(template):
         """
         odf_data = open_odf(template)
         return dict((filename, etree.parse(BytesIO(data)))
-                    for filename, data in odf_data.iteritems())
+                    for filename, data in six.iteritems(odf_data))
 
     def load_unit_tree(input_file):
         """Return a dict with the translations grouped by files ODF package.
@@ -85,7 +86,7 @@ def translate_dom_trees(unit_trees, dom_trees):
         """
         make_parse_state = lambda: ParseState(no_translate_content_elements,
                                               inline_elements)
-        for filename, dom_tree in dom_trees.iteritems():
+        for filename, dom_tree in six.iteritems(dom_trees):
             file_unit_tree = unit_trees[filename]
             apply_translations(dom_tree.getroot(), file_unit_tree,
                                replace_dom_text(make_parse_state))
@@ -110,7 +111,7 @@ def write_odf(template, output_file, dom_trees):
     output_zip = copy_odf(template_zip, output_zip, dom_trees.keys())
 
     # Overwrite the translated files to the ODF package.
-    for filename, dom_tree in dom_trees.iteritems():
+    for filename, dom_tree in six.iteritems(dom_trees):
         output_zip.writestr(filename, etree.tostring(dom_tree,
                                                      encoding='UTF-8',
                                                      xml_declaration=True))

translate/convert/xliff2oo.py

@@ -26,6 +26,7 @@
 
 import logging
 import os
+import six
 import time
 
 from translate.filters import autocorrect, checks, pofilter
@@ -57,7 +58,7 @@ def __init__(self, templatefile, languages=None, timestamp=None, includefuzzy=Fa
     def makeindex(self):
         """makes an index of the oo keys that are used in the source file"""
         self.index = {}
-        for ookey, theoo in self.o.ookeys.iteritems():
+        for ookey, theoo in six.iteritems(self.o.ookeys):
             sourcekey = oo.makekey(ookey, self.long_keys)
             self.index[sourcekey] = theoo
 
@@ -160,7 +161,7 @@ def validelement(self, unit, filename, filteraction):
         filterresult = self.filterunit(unit)
         if filterresult:
             if filterresult != autocorrect:
-                for filtername, filtermessage in filterresult.iteritems():
+                for filtername, filtermessage in six.iteritems(filterresult):
                     location = unit.getlocations()[0]
                     if filtername in self.options.error:
                         logger.error("Error at %s::%s: %s",

translate/filters/checks.py

@@ -32,6 +32,7 @@
 
 import logging
 import re
+import six
 
 from translate.filters import decoration, helpers, prefilters, spelling
 from translate.filters.decorators import (cosmetic, critical, extraction,
@@ -474,7 +475,7 @@ def run_filters(self, unit, categorised=False):
         self.results_cache = {}
 
         if not categorised:
-            for name, info in failures.iteritems():
+            for name, info in six.iteritems(failures):
                 failures[name] = info['message']
         return failures
 

translate/filters/pofilter.py

@@ -30,6 +30,7 @@
 """
 
 import os
+import six
 
 from translate.filters import autocorrect, checks
 from translate.misc import optrecurse
@@ -97,7 +98,7 @@ def getfilterdocs(self):
         """Lists the docs for filters available on checker."""
         filterdict = self.checker.getfilters()
         filterdocs = ["%s\t%s" % (name, filterfunc.__doc__.split('\n\n')[0])
-                      for (name, filterfunc) in filterdict.iteritems()]
+                      for (name, filterfunc) in six.iteritems(filterdict)]
         filterdocs.sort()
 
         return "\n".join(filterdocs)
@@ -147,7 +148,7 @@ def filterfile(self, transfile):
 
             if filter_result:
                 if filter_result != autocorrect:
-                    for filter_name in filter_result.iterkeys():
+                    for filter_name in six.iterkeys(filter_result):
                         filter_message = filter_result[filter_name]['message']
 
                         if self.options.addnotes:

translate/filters/prefilters.py

@@ -22,6 +22,7 @@
 """
 
 import re
+import six
 
 from translate.filters import decoration
 from translate.misc import quote
@@ -162,7 +163,7 @@ def filterwordswithpunctuation(str1):
     if u"'" not in str1:
         return str1
     occurrences = []
-    for word, replacement in wordswithpunctuation.iteritems():
+    for word, replacement in six.iteritems(wordswithpunctuation):
         occurrences.extend([(pos, word, replacement) for pos in quote.find_all(str1, word)])
     for match in word_with_apos_re.finditer(str1):
         word = match.group()

translate/lang/common.py

@@ -62,6 +62,7 @@
 
 import logging
 import re
+import six
 
 from translate.lang import data
 
@@ -245,7 +246,7 @@ def punctranslate(cls, text):
         ellipses_end = text.endswith(u"...")
         if ellipses_end:
             text = text[:-3]
-        for source, target in cls.puncdict.iteritems():
+        for source, target in six.iteritems(cls.puncdict):
             text = text.replace(source, target)
         if ellipses_end:
             if u"..." in cls.puncdict:

translate/lang/team.py

@@ -23,6 +23,7 @@
 """
 
 import re
+import six
 
 
 __all__ = ['LANG_TEAM_CONTACT_SNIPPETS', 'guess_language']
@@ -402,7 +403,7 @@ def _snippet_guesser(snippets_dict, string, filter_=_nofilter):
     before examination
     """
     string = filter_(string)
-    for possible_lang, snippets in snippets_dict.iteritems():
+    for possible_lang, snippets in six.iteritems(snippets_dict):
         for snippet in snippets:
             if filter_(snippet) in string:
                 return possible_lang