From 1dc46bee979266c96637ee558d257c0b2a645d48 Mon Sep 17 00:00:00 2001 From: milde Date: Mon, 26 Aug 2019 16:44:51 +0000 Subject: py3: Use 'sorted(foo)' instead of 'foo.sort()' This works with iterators also (like 'dict.keys()' in Python 3) Signed-off-by: Stephen Finucane git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8357 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- docutils/test/DocutilsTestSupport.py | 3 +-- docutils/test/test_dependencies.py | 9 +++------ docutils/test/test_language.py | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) (limited to 'docutils/test') diff --git a/docutils/test/DocutilsTestSupport.py b/docutils/test/DocutilsTestSupport.py index 2d40989f5..8b62ca5aa 100644 --- a/docutils/test/DocutilsTestSupport.py +++ b/docutils/test/DocutilsTestSupport.py @@ -815,8 +815,7 @@ class HtmlWriterPublishPartsTestCase(WriterPublishTestCase): if not parts[key]: del parts[key] # standard output format: - keys = parts.keys() - keys.sort() + keys = sorted(parts.keys()) output = [] for key in keys: output.append("%r: '''%s'''" diff --git a/docutils/test/test_dependencies.py b/docutils/test/test_dependencies.py index dea6a22f5..61d79c758 100755 --- a/docutils/test/test_dependencies.py +++ b/docutils/test/test_dependencies.py @@ -54,9 +54,8 @@ class RecordDependenciesTests(unittest.TestCase): if PIL: keys += ['figure-image'] expected = [paths[key] for key in keys] - record = self.get_record(writer_name='xml') + record = sorted(self.get_record(writer_name='xml')) # the order of the files is arbitrary - record.sort() expected.sort() self.assertEqual(record, expected) @@ -67,9 +66,8 @@ class RecordDependenciesTests(unittest.TestCase): expected = [paths[key] for key in keys] # stylesheets are tested separately in test_stylesheet_dependencies(): so = {'stylesheet_path': None, 'stylesheet': None} - record = self.get_record(writer_name='html', settings_overrides=so) + record = sorted(self.get_record(writer_name='html', settings_overrides=so)) # the order of the files is arbitrary - record.sort() expected.sort() self.assertEqual(record, expected) @@ -82,9 +80,8 @@ class RecordDependenciesTests(unittest.TestCase): if PIL: keys += ['figure-image'] expected = [paths[key] for key in keys] - record = self.get_record(writer_name='latex') + record = sorted(self.get_record(writer_name='latex')) # the order of the files is arbitrary - record.sort() expected.sort() self.assertEqual(record, expected) diff --git a/docutils/test/test_language.py b/docutils/test/test_language.py index 920d1b4e9..29de60c2a 100755 --- a/docutils/test/test_language.py +++ b/docutils/test/test_language.py @@ -150,8 +150,7 @@ class LanguageTestCase(DocutilsTestSupport.CustomTestCase): except Exception as error: failures.append('"%s": %s' % (d, error)) inverted = self._invert(module.directives) - canonical = directives._directive_registry.keys() - canonical.sort() + canonical = sorted(directives._directive_registry.keys()) canonical.remove('restructuredtext-test-directive') for name in canonical: if name not in inverted: @@ -185,8 +184,7 @@ class LanguageTestCase(DocutilsTestSupport.CustomTestCase): except KeyError as error: failures.append('"%s": %s' % (d, error)) inverted = self._invert(module.roles) - canonical = roles._role_registry.keys() - canonical.sort() + canonical = sorted(roles._role_registry.keys()) canonical.remove('restructuredtext-unimplemented-role') for name in canonical: if name not in inverted: -- cgit v1.2.1