py3: Wrap 'foo.keys()', 'zip(foo, bar') in 'list'

In Python 3, 'dict.keys()', 'zip' and 'map' no longer return a list but
rather types 'dict_keys', 'zip' and 'map', respectively. You can't
append to these types nor can you delete from them while in a loop.  The
simple solution to both issues is to wrap things in 'list'.

Signed-off-by: Stephen Finucane <stephen@that.guru>

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8372 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

9 files changed, 9 insertions, 10 deletions

diff --git a/docutils/docutils/parsers/rst/tableparser.py b/docutils/docutils/parsers/rst/tableparser.py
index 0662d6c2c..b51766fdd 100644
--- a/docutils/docutils/parsers/rst/tableparser.py
+++ b/docutils/docutils/parsers/rst/tableparser.py
@@ -290,7 +290,7 @@ class GridTableParser(TableParser):
         rowindex = {}
         for i in range(len(rowseps)):
             rowindex[rowseps[i]] = i    # row boundary -> row number mapping
-        colseps = self.colseps.keys()   # list of column boundaries
+        colseps = list(self.colseps.keys())   # list of column boundaries
         colseps.sort()
         colindex = {}
         for i in range(len(colseps)):
diff --git a/docutils/docutils/statemachine.py b/docutils/docutils/statemachine.py
index 45280a69d..ce04600c8 100644
--- a/docutils/docutils/statemachine.py
+++ b/docutils/docutils/statemachine.py
@@ -1297,7 +1297,7 @@ class ViewList(object):
         self.parent = None
 
     def sort(self, *args):
-        tmp = zip(self.data, self.items)
+        tmp = list(zip(self.data, self.items))
         tmp.sort(*args)
         self.data = [entry[0] for entry in tmp]
         self.items = [entry[1] for entry in tmp]
diff --git a/docutils/docutils/utils/__init__.py b/docutils/docutils/utils/__init__.py
index 013914bdc..650352ad8 100644
--- a/docutils/docutils/utils/__init__.py
+++ b/docutils/docutils/utils/__init__.py
@@ -618,7 +618,7 @@ def column_indices(text):
     """
     # TODO: account for asian wide chars here instead of using dummy
     # replacements in the tableparser?
-    string_indices = range(len(text))
+    string_indices = list(range(len(text)))
     for index in find_combining_chars(text):
         string_indices[index] = None
     return [i for i in string_indices if i is not None]
diff --git a/docutils/docutils/utils/math/math2html.py b/docutils/docutils/utils/math/math2html.py
index a7e2aed4d..53dd83631 100644
--- a/docutils/docutils/utils/math/math2html.py
+++ b/docutils/docutils/utils/math/math2html.py
@@ -2819,7 +2819,7 @@ class Bracket(FormulaBit):
 
   def innertext(self, pos):
     "Parse some text inside the bracket, following textual rules."
-    specialchars = FormulaConfig.symbolfunctions.keys()
+    specialchars = list(FormulaConfig.symbolfunctions.keys())
     specialchars.append(FormulaConfig.starts['command'])
     specialchars.append(FormulaConfig.starts['bracket'])
     specialchars.append(Comment.start)
diff --git a/docutils/docutils/writers/odf_odt/__init__.py b/docutils/docutils/writers/odf_odt/__init__.py
index 8085e4cc9..e54674f90 100644
--- a/docutils/docutils/writers/odf_odt/__init__.py
+++ b/docutils/docutils/writers/odf_odt/__init__.py
@@ -1117,8 +1117,7 @@ class ODFTranslator(nodes.GenericNodeVisitor):
             fin = os.popen("paperconf -s 2> /dev/null")
             content = fin.read()
             content = content.split()
-            content = map(float, content)
-            content = list(content)
+            content = list(map(float, content))
             w, h = content
         except (IOError, ValueError):
             w, h = 612, 792     # default to Letter
diff --git a/docutils/test/DocutilsTestSupport.py b/docutils/test/DocutilsTestSupport.py
index 107633f5b..50165e09c 100644
--- a/docutils/test/DocutilsTestSupport.py
+++ b/docutils/test/DocutilsTestSupport.py
@@ -811,7 +811,7 @@ class HtmlWriterPublishPartsTestCase(WriterPublishTestCase):
         parts['html_prolog'] = parts['html_prolog'].replace(
             self.standard_html_prolog, '')
         # remove empty values:
-        for key in parts.keys():
+        for key in list(parts.keys()):
             if not parts[key]:
                 del parts[key]
         # standard output format:
diff --git a/docutils/test/test_functional.py b/docutils/test/test_functional.py
index f33929ba9..1a9534256 100755
--- a/docutils/test/test_functional.py
+++ b/docutils/test/test_functional.py
@@ -154,7 +154,7 @@ expected output and check it in:
         del params['test_source']
         del params['test_destination']
         # Delete private stuff like params['__builtins__']:
-        for key in params.keys():
+        for key in list(params.keys()):
             if key.startswith('_'):
                 del params[key]
         # Get output (automatically written to the output/ directory
diff --git a/docutils/test/test_language.py b/docutils/test/test_language.py
index 29de60c2a..af717ccf9 100755
--- a/docutils/test/test_language.py
+++ b/docutils/test/test_language.py
@@ -52,7 +52,7 @@ class LanguageTestSuite(DocutilsTestSupport.CustomTestSuite):
             match = self.language_module_pattern.match(mod)
             if match:
                 languages[match.group(1)] = 1
-        self.languages = languages.keys()
+        self.languages = list(languages.keys())
         # test language tag normalization:
         self.languages += ['en_gb', 'en_US', 'en-CA', 'de-DE', 'de-AT-1901',
                            'pt-BR', 'pt-foo-BR']
diff --git a/docutils/test/test_statemachine.py b/docutils/test/test_statemachine.py
index 77dbd7029..14db7f0f1 100755
--- a/docutils/test/test_statemachine.py
+++ b/docutils/test/test_statemachine.py
@@ -152,7 +152,7 @@ class SMWSTests(unittest.TestCase):
         self.sm.unlink()
 
     def test___init__(self):
-        self.assertEqual(self.sm.states.keys(), ['MockState'])
+        self.assertEqual(list(self.sm.states.keys()), ['MockState'])
         self.assertEqual(len(self.sm.states['MockState'].transitions), 4)
 
     def test_get_indented(self):