diff options
| author | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2019-08-27 12:11:15 +0000 |
|---|---|---|
| committer | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2019-08-27 12:11:15 +0000 |
| commit | c59685933a11d3d7c1b558e7097817a1cd002bb5 (patch) | |
| tree | f512f76a053cb9a68bad6026b4b8a89087a37090 /docutils/test | |
| parent | 1147d5f61adc1adbd3359d42d4296a4bd583b2bf (diff) | |
| download | docutils-c59685933a11d3d7c1b558e7097817a1cd002bb5.tar.gz | |
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
Diffstat (limited to 'docutils/test')
| -rw-r--r-- | docutils/test/DocutilsTestSupport.py | 2 | ||||
| -rwxr-xr-x | docutils/test/test_functional.py | 2 | ||||
| -rwxr-xr-x | docutils/test/test_language.py | 2 | ||||
| -rwxr-xr-x | docutils/test/test_statemachine.py | 2 |
4 files changed, 4 insertions, 4 deletions
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): |