diff options
| author | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2022-01-03 23:48:58 +0000 |
|---|---|---|
| committer | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2022-01-03 23:48:58 +0000 |
| commit | 215a4e517cb0c3c544d2c67b10e032f6f86a091e (patch) | |
| tree | c853b18f419f5a0f81782b234cf37a2455ba51be /docutils | |
| parent | 6a2f86ea0f1e9aa10be166a0f269c5a5047415ea (diff) | |
| download | docutils-215a4e517cb0c3c544d2c67b10e032f6f86a091e.tar.gz | |
Remove 2.7-compatibility __future__ imports.
git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk@8925 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
Diffstat (limited to 'docutils')
141 files changed, 115 insertions, 268 deletions
diff --git a/docutils/docutils/core.py b/docutils/docutils/core.py index 0fe19bbe4..03c7804bf 100644 --- a/docutils/docutils/core.py +++ b/docutils/docutils/core.py @@ -11,7 +11,6 @@ custom component objects first, and pass *them* to .. _The Docutils Publisher: http://docutils.sf.net/docs/api/publisher.html """ -from __future__ import print_function __docformat__ = 'reStructuredText' diff --git a/docutils/docutils/io.py b/docutils/docutils/io.py index 2b2dd594d..5363c1979 100644 --- a/docutils/docutils/io.py +++ b/docutils/docutils/io.py @@ -6,7 +6,6 @@ I/O classes provide a uniform API for low-level input and output. Subclasses exist for a variety of input/output mechanisms. """ -from __future__ import print_function __docformat__ = 'reStructuredText' diff --git a/docutils/docutils/nodes.py b/docutils/docutils/nodes.py index ffe93bb9b..321a64651 100644 --- a/docutils/docutils/nodes.py +++ b/docutils/docutils/nodes.py @@ -19,14 +19,13 @@ hierarchy. .. _DTD: http://docutils.sourceforge.net/docs/ref/docutils.dtd """ -from __future__ import print_function -from collections import Counter __docformat__ = 'reStructuredText' -import sys +from collections import Counter import os import re +import sys import warnings import unicodedata # import xml.dom.minidom as dom # -> conditional import in Node.asdom() diff --git a/docutils/docutils/statemachine.py b/docutils/docutils/statemachine.py index 0411d88e5..808ddbf34 100644 --- a/docutils/docutils/statemachine.py +++ b/docutils/docutils/statemachine.py @@ -103,7 +103,6 @@ How To Use This Module sm.unlink() """ -from __future__ import print_function __docformat__ = 'restructuredtext' diff --git a/docutils/docutils/utils/math/tex2mathml_extern.py b/docutils/docutils/utils/math/tex2mathml_extern.py index 5899cd2b6..c07d41669 100644 --- a/docutils/docutils/utils/math/tex2mathml_extern.py +++ b/docutils/docutils/utils/math/tex2mathml_extern.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # :Id: $Id$ @@ -18,7 +18,6 @@ This module is provisional: the API is not settled and may change with any minor Docutils version. """ -from __future__ import print_function import subprocess document_template = r"""\documentclass{article} diff --git a/docutils/docutils/utils/smartquotes.py b/docutils/docutils/utils/smartquotes.py index 3598c5d74..cf9ee6ab6 100644 --- a/docutils/docutils/utils/smartquotes.py +++ b/docutils/docutils/utils/smartquotes.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- # :Id: $Id$ @@ -315,7 +315,6 @@ Version History 1.5_1.0: Tue, 09 Mar 2004 08:08:35 -0500 - Initial release """ -from __future__ import print_function options = r""" Options diff --git a/docutils/docutils/writers/latex2e/__init__.py b/docutils/docutils/writers/latex2e/__init__.py index 7f7465c9a..2c19a52eb 100644 --- a/docutils/docutils/writers/latex2e/__init__.py +++ b/docutils/docutils/writers/latex2e/__init__.py @@ -6,8 +6,6 @@ """LaTeX2e document tree Writer.""" -from __future__ import division - __docformat__ = 'reStructuredText' # code contributions from several people included, thanks to all. diff --git a/docutils/docutils/writers/odf_odt/__init__.py b/docutils/docutils/writers/odf_odt/__init__.py index 5f8bccbf2..e8c86b69d 100644 --- a/docutils/docutils/writers/odf_odt/__init__.py +++ b/docutils/docutils/writers/odf_odt/__init__.py @@ -8,7 +8,6 @@ Open Document Format (ODF) Writer. This module is provisional: the API is not settled and may change with any minor Docutils version. """ -from __future__ import absolute_import __docformat__ = 'reStructuredText' diff --git a/docutils/install.py b/docutils/install.py index 0c5541274..2cd4efae4 100755 --- a/docutils/install.py +++ b/docutils/install.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # $Id$ # Copyright: This file has been placed in the public domain. @@ -15,7 +15,6 @@ one of:: python setup.py install --help python setup.py --help """ -from __future__ import print_function from distutils import core from setup import do_setup diff --git a/docutils/setup.py b/docutils/setup.py index 870b99b4d..1c008c27b 100755 --- a/docutils/setup.py +++ b/docutils/setup.py @@ -1,9 +1,7 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # $Id$ # Copyright: This file has been placed in the public domain. -from __future__ import print_function - import glob import os import sys diff --git a/docutils/test/DocutilsTestSupport.py b/docutils/test/DocutilsTestSupport.py index 253c5f6bf..c25f3dbb1 100644 --- a/docutils/test/DocutilsTestSupport.py +++ b/docutils/test/DocutilsTestSupport.py @@ -38,7 +38,6 @@ Exports the following: - `HtmlFragmentTestSuite` - `DevNull` (output sink) """ -from __future__ import print_function __docformat__ = 'reStructuredText' import sys diff --git a/docutils/test/alltests.py b/docutils/test/alltests.py index 623c61195..669e3da0b 100755 --- a/docutils/test/alltests.py +++ b/docutils/test/alltests.py @@ -1,6 +1,5 @@ #!/bin/sh ''''exec python -u "$0" "$@" #''' -from __future__ import print_function # $Id$ # Author: David Goodger <goodger@python.org> diff --git a/docutils/test/package_unittest.py b/docutils/test/package_unittest.py index 3f593bd8e..2d2272bd1 100644 --- a/docutils/test/package_unittest.py +++ b/docutils/test/package_unittest.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: Garth Kidd <garth@deadlybloodyserious.com> @@ -9,7 +9,6 @@ This module extends unittest.py with `loadTestModules()`, by loading multiple test modules from a directory. Optionally, test packages are also loaded, recursively. """ -from __future__ import print_function import sys import os diff --git a/docutils/test/test_error_reporting.py b/docutils/test/test_error_reporting.py index bd983b005..f472fca77 100644 --- a/docutils/test/test_error_reporting.py +++ b/docutils/test/test_error_reporting.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # .. coding: utf-8 # $Id$ # Author: Günter Milde <milde@users.sourceforge.net> @@ -24,7 +24,6 @@ instances like, e.g., :: unless the minimal required Python version has this problem fixed. """ -from __future__ import print_function import os import sys diff --git a/docutils/test/test_functional.py b/docutils/test/test_functional.py index bc2d89f5a..b7f2ab92a 100755 --- a/docutils/test/test_functional.py +++ b/docutils/test/test_functional.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # $Id$ # Author: Lea Wiemann <LeWiemann@gmail.com> @@ -9,7 +9,6 @@ Perform tests with the data in the functional/ directory. Read README.txt for details on how this is done. """ -from __future__ import print_function import sys import os diff --git a/docutils/test/test_parsers/test_get_parser_class.py b/docutils/test/test_parsers/test_get_parser_class.py index 0ae688d3d..ec7083189 100644 --- a/docutils/test/test_parsers/test_get_parser_class.py +++ b/docutils/test/test_parsers/test_get_parser_class.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: grubert abadger1999 @@ -8,7 +8,6 @@ """ test get_parser_class """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_recommonmark/test_block_quotes.py b/docutils/test/test_parsers/test_recommonmark/test_block_quotes.py index 1da33a9c6..1d7000cc5 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_block_quotes.py +++ b/docutils/test/test_parsers/test_recommonmark/test_block_quotes.py @@ -15,8 +15,6 @@ Test for block quotes in CommonMark parsers Cf. the `CommonMark Specification <https://spec.commonmark.org/>`__ """ -from __future__ import absolute_import - if __name__ == '__main__': import __init__ from test_parsers import DocutilsTestSupport diff --git a/docutils/test/test_parsers/test_recommonmark/test_bullet_lists.py b/docutils/test/test_parsers/test_recommonmark/test_bullet_lists.py index 93324d5b2..4181e5d13 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_bullet_lists.py +++ b/docutils/test/test_parsers/test_recommonmark/test_bullet_lists.py @@ -15,8 +15,6 @@ Test for bullet lists in CommonMark parsers. Cf. the `CommonMark Specification <https://spec.commonmark.org/>`__ """ -from __future__ import absolute_import - if __name__ == '__main__': import __init__ from test_parsers import DocutilsTestSupport diff --git a/docutils/test/test_parsers/test_recommonmark/test_enumerated_lists.py b/docutils/test/test_parsers/test_recommonmark/test_enumerated_lists.py index bbf01148b..20876edba 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_enumerated_lists.py +++ b/docutils/test/test_parsers/test_recommonmark/test_enumerated_lists.py @@ -13,7 +13,6 @@ Test for enumerated lists in CommonMark parsers Cf. the `CommonMark Specification <https://spec.commonmark.org/>`__ """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_recommonmark/test_html_blocks.py b/docutils/test/test_parsers/test_recommonmark/test_html_blocks.py index 05452f5f0..d70f6ab00 100644 --- a/docutils/test/test_parsers/test_recommonmark/test_html_blocks.py +++ b/docutils/test/test_parsers/test_recommonmark/test_html_blocks.py @@ -14,7 +14,6 @@ Tests for HTML blocks in CommonMark parsers Cf. the `CommonMark Specification <https://spec.commonmark.org/>`__ """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_recommonmark/test_inline_markup.py b/docutils/test/test_parsers/test_recommonmark/test_inline_markup.py index 5dc2540b8..b0057e06a 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_inline_markup.py +++ b/docutils/test/test_parsers/test_recommonmark/test_inline_markup.py @@ -14,8 +14,6 @@ Tests for inline markup in CommonMark parsers Cf. the `CommonMark Specification <https://spec.commonmark.org/>`__ """ -from __future__ import absolute_import - if __name__ == '__main__': import __init__ from test_parsers import DocutilsTestSupport diff --git a/docutils/test/test_parsers/test_recommonmark/test_line_length_limit.py b/docutils/test/test_parsers/test_recommonmark/test_line_length_limit.py index 1f82f9aa0..399e3e9e9 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_line_length_limit.py +++ b/docutils/test/test_parsers/test_recommonmark/test_line_length_limit.py @@ -14,7 +14,6 @@ Tests for inline markup in docutils/parsers/rst/states.py. Interpreted text tests are in a separate module, test_interpreted.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_recommonmark/test_line_length_limit_default.py b/docutils/test/test_parsers/test_recommonmark/test_line_length_limit_default.py index e8f0560a0..dbb6c8c44 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_line_length_limit_default.py +++ b/docutils/test/test_parsers/test_recommonmark/test_line_length_limit_default.py @@ -15,7 +15,6 @@ Tests for inline markup in docutils/parsers/rst/states.py. Interpreted text tests are in a separate module, test_interpreted.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_recommonmark/test_literal_blocks.py b/docutils/test/test_parsers/test_recommonmark/test_literal_blocks.py index 134dd1461..082c96710 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_literal_blocks.py +++ b/docutils/test/test_parsers/test_recommonmark/test_literal_blocks.py @@ -14,7 +14,6 @@ Tests for literal blocks in CommonMark parsers Cf. the `CommonMark Specification <https://spec.commonmark.org/>`__ """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_recommonmark/test_misc.py b/docutils/test/test_parsers/test_recommonmark/test_misc.py index 3e28871fe..3fd179e06 100644 --- a/docutils/test/test_parsers/test_recommonmark/test_misc.py +++ b/docutils/test/test_parsers/test_recommonmark/test_misc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf8 -*- # :Copyright: © 2020 Günter Milde. # :License: Released under the terms of the `2-Clause BSD license`_, in short: @@ -14,7 +14,6 @@ Various tests for the recommonmark parser. """ -from __future__ import absolute_import import sys import unittest diff --git a/docutils/test/test_parsers/test_recommonmark/test_paragraphs.py b/docutils/test/test_parsers/test_recommonmark/test_paragraphs.py index 2d284a6c1..d77517330 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_paragraphs.py +++ b/docutils/test/test_parsers/test_recommonmark/test_paragraphs.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_recommonmark/test_section_headers.py b/docutils/test/test_parsers/test_recommonmark/test_section_headers.py index 5e79b6725..27563f079 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_section_headers.py +++ b/docutils/test/test_parsers/test_recommonmark/test_section_headers.py @@ -14,8 +14,6 @@ Test for section headings in CommonMark parsers. Cf. the `CommonMark Specification <https://spec.commonmark.org/>`__ """ -from __future__ import absolute_import - if __name__ == '__main__': import __init__ from test_parsers import DocutilsTestSupport diff --git a/docutils/test/test_parsers/test_recommonmark/test_targets.py b/docutils/test/test_parsers/test_recommonmark/test_targets.py index 11f3b550e..480fb8eba 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_targets.py +++ b/docutils/test/test_parsers/test_recommonmark/test_targets.py @@ -14,8 +14,6 @@ Test for targets in CommonMark parsers. Cf. the `CommonMark Specification <https://spec.commonmark.org/>`__ """ -from __future__ import absolute_import - if __name__ == '__main__': import __init__ from test_parsers import DocutilsTestSupport diff --git a/docutils/test/test_parsers/test_recommonmark/test_transitions.py b/docutils/test/test_parsers/test_recommonmark/test_transitions.py index 35649ed5a..83cd0f25f 100755 --- a/docutils/test/test_parsers/test_recommonmark/test_transitions.py +++ b/docutils/test/test_parsers/test_recommonmark/test_transitions.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for transitions (`thematic breaks`). """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_SimpleTableParser.py b/docutils/test/test_parsers/test_rst/test_SimpleTableParser.py index f52d6d549..1095c0f19 100755 --- a/docutils/test/test_parsers/test_rst/test_SimpleTableParser.py +++ b/docutils/test/test_parsers/test_rst/test_SimpleTableParser.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # .. coding: utf-8 # $Id$ @@ -8,7 +8,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_TableParser.py b/docutils/test/test_parsers/test_rst/test_TableParser.py index 97d280d4a..a563b0490 100755 --- a/docutils/test/test_parsers/test_rst/test_TableParser.py +++ b/docutils/test/test_parsers/test_rst/test_TableParser.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # coding: utf-8 # $Id$ @@ -8,7 +8,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_block_quotes.py b/docutils/test/test_parsers/test_rst/test_block_quotes.py index 870d5e57d..5264cad8a 100755 --- a/docutils/test/test_parsers/test_rst/test_block_quotes.py +++ b/docutils/test/test_parsers/test_rst/test_block_quotes.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_bullet_lists.py b/docutils/test/test_parsers/test_rst/test_bullet_lists.py index e8bf7a4a9..9453229c7 100755 --- a/docutils/test/test_parsers/test_rst/test_bullet_lists.py +++ b/docutils/test/test_parsers/test_rst/test_bullet_lists.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_character_level_inline_markup.py b/docutils/test/test_parsers/test_rst/test_character_level_inline_markup.py index 2a9dd0573..267f4da29 100644 --- a/docutils/test/test_parsers/test_rst/test_character_level_inline_markup.py +++ b/docutils/test/test_parsers/test_rst/test_character_level_inline_markup.py @@ -11,7 +11,6 @@ with the "character-level-inline-markup" setting. Experimental. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_citations.py b/docutils/test/test_parsers/test_rst/test_citations.py index d4f433c27..63e9e0402 100755 --- a/docutils/test/test_parsers/test_rst/test_citations.py +++ b/docutils/test/test_parsers/test_rst/test_citations.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_comments.py b/docutils/test/test_parsers/test_rst/test_comments.py index 5e97a2a58..584fd4624 100755 --- a/docutils/test/test_parsers/test_rst/test_comments.py +++ b/docutils/test/test_parsers/test_rst/test_comments.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_definition_lists.py b/docutils/test/test_parsers/test_rst/test_definition_lists.py index 50c37c2d5..989389cb6 100755 --- a/docutils/test/test_parsers/test_rst/test_definition_lists.py +++ b/docutils/test/test_parsers/test_rst/test_definition_lists.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test__init__.py b/docutils/test/test_parsers/test_rst/test_directives/test__init__.py index 319f035de..ae0061246 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/test__init__.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test__init__.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # -*- coding: utf-8 -*- # $Id$ # Author: Günter Milde <milde@users.sourceforge.net>, @@ -14,7 +14,6 @@ Test module for `docutils.parsers.rst.directives`. """ -from __future__ import absolute_import import unittest diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_admonitions.py b/docutils/test/test_parsers/test_rst/test_directives/test_admonitions.py index 03e65f30b..01e6a815f 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_admonitions.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_admonitions.py @@ -7,7 +7,6 @@ """ Tests for admonitions.py directives. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_admonitions_de.py b/docutils/test/test_parsers/test_rst/test_directives/test_admonitions_de.py index b4588490f..3d96797f5 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/test_admonitions_de.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_admonitions_de.py @@ -7,7 +7,6 @@ """ Tests for admonitions.py directives in German document. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_admonitions_dummy_lang.py b/docutils/test/test_parsers/test_rst/test_directives/test_admonitions_dummy_lang.py index 4fec927e6..94653a968 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/test_admonitions_dummy_lang.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_admonitions_dummy_lang.py @@ -7,7 +7,6 @@ """ Tests for admonition directives with local language module. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_block_quotes.py b/docutils/test/test_parsers/test_rst/test_directives/test_block_quotes.py index 3026831b2..bf20f3f1a 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_block_quotes.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_block_quotes.py @@ -8,7 +8,6 @@ Tests for the block quote directives "epigraph", "highlights", and "pull-quote". """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_class.py b/docutils/test/test_parsers/test_rst/test_directives/test_class.py index 158b406d4..da60c4f25 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_class.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_class.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: Lea Wiemann <LeWiemann@gmail.com> @@ -7,7 +7,6 @@ """ Tests for the 'class' directive. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_code.py b/docutils/test/test_parsers/test_rst/test_directives/test_code.py index 14d0903a3..741141245 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/test_code.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_code.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: Guenter Milde @@ -7,7 +7,6 @@ """ Test the 'code' directive in parsers/rst/directives/body.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_code_long.py b/docutils/test/test_parsers/test_rst/test_directives/test_code_long.py index 9266470a4..0237ef72c 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/test_code_long.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_code_long.py @@ -7,7 +7,6 @@ """ Test the 'code' directive in body.py with syntax_highlight = 'long'. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_code_none.py b/docutils/test/test_parsers/test_rst/test_directives/test_code_none.py index 99bbbe554..aa4acded5 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/test_code_none.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_code_none.py @@ -7,7 +7,6 @@ """ Test the 'code' directive in body.py with syntax_highlight = 'none'. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_code_parsing.py b/docutils/test/test_parsers/test_rst/test_directives/test_code_parsing.py index 646403320..cdc3c6af8 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/test_code_parsing.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_code_parsing.py @@ -14,7 +14,6 @@ Various tests for the `pygments` code highlighter. """ -from __future__ import absolute_import import unittest if __name__ == '__main__': diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_compound.py b/docutils/test/test_parsers/test_rst/test_directives/test_compound.py index bee284237..31aa52195 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_compound.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_compound.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for the 'compound' directive from body.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_container.py b/docutils/test/test_parsers/test_rst/test_directives/test_container.py index 2c30b4dce..a1a62883a 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_container.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_container.py @@ -7,7 +7,6 @@ """ Tests for the 'container' directive from body.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_contents.py b/docutils/test/test_parsers/test_rst/test_directives/test_contents.py index 264fc267b..017fa8208 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_contents.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_contents.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for parts.py contents directive. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_date.py b/docutils/test/test_parsers/test_rst/test_directives/test_date.py index 24cb3129d..6c45b9848 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_date.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_date.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for the misc.py "date" directive. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_decorations.py b/docutils/test/test_parsers/test_rst/test_directives/test_decorations.py index bdeedf604..62068d1e9 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_decorations.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_decorations.py @@ -7,7 +7,6 @@ """ Tests for the "header" & "footer" directives. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_default_role.py b/docutils/test/test_parsers/test_rst/test_directives/test_default_role.py index 6e382d583..1bb4b6879 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_default_role.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_default_role.py @@ -7,7 +7,6 @@ """ Tests for misc.py "default-role" directive. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_figures.py b/docutils/test/test_parsers/test_rst/test_directives/test_figures.py index bcd62a057..a667e3769 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_figures.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_figures.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for images.py figure directives. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_images.py b/docutils/test/test_parsers/test_rst/test_directives/test_images.py index c305d5f7c..d7c744d62 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_images.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_images.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for images.py image directives. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_include.py b/docutils/test/test_parsers/test_rst/test_directives/test_include.py index 04d2e9f7d..4e99144a1 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_include.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_include.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for misc.py "include" directive. """ -from __future__ import absolute_import import os.path import sys diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_line_blocks.py b/docutils/test/test_parsers/test_rst/test_directives/test_line_blocks.py index 315899fb0..f585595f2 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_line_blocks.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_line_blocks.py @@ -7,7 +7,6 @@ """ Tests for the body.py 'line-block' directive. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_math.py b/docutils/test/test_parsers/test_rst/test_directives/test_math.py index 2e54559ad..c6b6c14f0 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/test_math.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_math.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: Guenter Milde <milde@users.sf.net> @@ -7,7 +7,6 @@ """ Tests for the 'math' directive. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_meta.py b/docutils/test/test_parsers/test_rst/test_directives/test_meta.py index 90899e35b..f307bbf4a 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_meta.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_meta.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for html meta directives. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_parsed_literals.py b/docutils/test/test_parsers/test_rst/test_directives/test_parsed_literals.py index 421ecd29d..539daf02c 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_parsed_literals.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_parsed_literals.py @@ -7,7 +7,6 @@ """ Tests for the body.py 'parsed-literal' directive. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_raw.py b/docutils/test/test_parsers/test_rst/test_directives/test_raw.py index 74e348a73..8d4dad1f2 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_raw.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_raw.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for misc.py "raw" directive. """ -from __future__ import absolute_import import os.path import sys diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_replace.py b/docutils/test/test_parsers/test_rst/test_directives/test_replace.py index d0fcaf980..de460f67b 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_replace.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_replace.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for misc.py "replace" directive. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_replace_fr.py b/docutils/test/test_parsers/test_rst/test_directives/test_replace_fr.py index 25641b820..53980d663 100644 --- a/docutils/test/test_parsers/test_rst/test_directives/test_replace_fr.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_replace_fr.py @@ -8,7 +8,6 @@ Tests for misc.py "replace" directive. Test in french (not default/fallback language). """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_role.py b/docutils/test/test_parsers/test_rst/test_directives/test_role.py index f5b769806..a7040328e 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_role.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_role.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for misc.py "role" directive. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_rubrics.py b/docutils/test/test_parsers/test_rst/test_directives/test_rubrics.py index ccd62f74a..95eec860e 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_rubrics.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_rubrics.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for the "rubric" directive. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_sectnum.py b/docutils/test/test_parsers/test_rst/test_directives/test_sectnum.py index 24ba0dbb2..647cd4224 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_sectnum.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_sectnum.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: Lea Wiemann <LeWiemann@gmail.com> @@ -7,7 +7,6 @@ """ Tests for the 'sectnum' directive. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_sidebars.py b/docutils/test/test_parsers/test_rst/test_directives/test_sidebars.py index 4f309edb3..f818bea4f 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_sidebars.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_sidebars.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for the "sidebar" directive. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_tables.py b/docutils/test/test_parsers/test_rst/test_directives/test_tables.py index 73724ed7e..9aa5495f4 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_tables.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_tables.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for tables.py directives. """ -from __future__ import absolute_import import os import sys diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_target_notes.py b/docutils/test/test_parsers/test_rst/test_directives/test_target_notes.py index a122f30dc..7e922eefd 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_target_notes.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_target_notes.py @@ -7,7 +7,6 @@ """ Tests for the target-notes directives. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_test_directives.py b/docutils/test/test_parsers/test_rst/test_directives/test_test_directives.py index 59718c2b0..df71576b4 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_test_directives.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_test_directives.py @@ -7,7 +7,6 @@ """ Tests for misc.py test directives. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_title.py b/docutils/test/test_parsers/test_rst/test_directives/test_title.py index 002422fd0..bd31078db 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_title.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_title.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: Lea Wiemann <LeWiemann@gmail.com> @@ -7,7 +7,6 @@ """ Tests for the 'title' directive. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_topics.py b/docutils/test/test_parsers/test_rst/test_directives/test_topics.py index 048d4e821..14d20bc28 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_topics.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_topics.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for the "topic" directive. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_unicode.py b/docutils/test/test_parsers/test_rst/test_directives/test_unicode.py index a2ca09167..7764bf91c 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_unicode.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_unicode.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for misc.py "unicode" directive. """ -from __future__ import absolute_import import sys diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_unknown.py b/docutils/test/test_parsers/test_rst/test_directives/test_unknown.py index 198d4a821..7f65938c5 100755 --- a/docutils/test/test_parsers/test_rst/test_directives/test_unknown.py +++ b/docutils/test/test_parsers/test_rst/test_directives/test_unknown.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for unknown directives. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_doctest_blocks.py b/docutils/test/test_parsers/test_rst/test_doctest_blocks.py index a8ab0b160..7522d864e 100755 --- a/docutils/test/test_parsers/test_rst/test_doctest_blocks.py +++ b/docutils/test/test_parsers/test_rst/test_doctest_blocks.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_east_asian_text.py b/docutils/test/test_parsers/test_rst/test_east_asian_text.py index 484f327ee..e971ae80c 100755 --- a/docutils/test/test_parsers/test_rst/test_east_asian_text.py +++ b/docutils/test/test_parsers/test_rst/test_east_asian_text.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # -*- coding: utf-8 -*- # $Id$ @@ -8,7 +8,6 @@ """ Tests for East Asian text with double-width characters. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_enumerated_lists.py b/docutils/test/test_parsers/test_rst/test_enumerated_lists.py index 7a90cd3bb..713ee4a59 100755 --- a/docutils/test/test_parsers/test_rst/test_enumerated_lists.py +++ b/docutils/test/test_parsers/test_rst/test_enumerated_lists.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_field_lists.py b/docutils/test/test_parsers/test_rst/test_field_lists.py index bdf885898..fe557937c 100755 --- a/docutils/test/test_parsers/test_rst/test_field_lists.py +++ b/docutils/test/test_parsers/test_rst/test_field_lists.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_footnotes.py b/docutils/test/test_parsers/test_rst/test_footnotes.py index 2bb8da5f3..0ca6c5ef6 100755 --- a/docutils/test/test_parsers/test_rst/test_footnotes.py +++ b/docutils/test/test_parsers/test_rst/test_footnotes.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_inline_markup.py b/docutils/test/test_parsers/test_rst/test_inline_markup.py index 6236457ca..2929057b3 100755 --- a/docutils/test/test_parsers/test_rst/test_inline_markup.py +++ b/docutils/test/test_parsers/test_rst/test_inline_markup.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # -*- coding: utf-8 -*- # $Id$ @@ -9,7 +9,6 @@ Tests for inline markup in docutils/parsers/rst/states.py. Interpreted text tests are in a separate module, test_interpreted.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_interpreted.py b/docutils/test/test_parsers/test_rst/test_interpreted.py index 04feaefb4..0af7b6570 100755 --- a/docutils/test/test_parsers/test_rst/test_interpreted.py +++ b/docutils/test/test_parsers/test_rst/test_interpreted.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for interpreted text in docutils/parsers/rst/states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_interpreted_fr.py b/docutils/test/test_parsers/test_rst/test_interpreted_fr.py index c08248467..f0d1936f8 100644 --- a/docutils/test/test_parsers/test_rst/test_interpreted_fr.py +++ b/docutils/test/test_parsers/test_rst/test_interpreted_fr.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id: test_interpreted.py 6424 2010-09-18 10:43:52Z smerten $ # Author: David Goodger <goodger@python.org> @@ -8,7 +8,6 @@ Tests for interpreted text in docutils/parsers/rst/states.py. Test not default/fallback language french. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_line_blocks.py b/docutils/test/test_parsers/test_rst/test_line_blocks.py index d80a1c939..1ef343540 100755 --- a/docutils/test/test_parsers/test_rst/test_line_blocks.py +++ b/docutils/test/test_parsers/test_rst/test_line_blocks.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_line_length_limit.py b/docutils/test/test_parsers/test_rst/test_line_length_limit.py index 5531c91fc..ed616b9ce 100755 --- a/docutils/test/test_parsers/test_rst/test_line_length_limit.py +++ b/docutils/test/test_parsers/test_rst/test_line_length_limit.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf8 -*- # :Copyright: © 2020 Günter Milde. # :License: Released under the terms of the `2-Clause BSD license`_, in short: @@ -14,7 +14,6 @@ Tests for inline markup in docutils/parsers/rst/states.py. Interpreted text tests are in a separate module, test_interpreted.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_line_length_limit_default.py b/docutils/test/test_parsers/test_rst/test_line_length_limit_default.py index c6e07e545..7430732e6 100755 --- a/docutils/test/test_parsers/test_rst/test_line_length_limit_default.py +++ b/docutils/test/test_parsers/test_rst/test_line_length_limit_default.py @@ -14,7 +14,6 @@ Tests for inline markup in docutils/parsers/rst/states.py. Interpreted text tests are in a separate module, test_interpreted.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_literal_blocks.py b/docutils/test/test_parsers/test_rst/test_literal_blocks.py index 5b64e014f..71482406a 100755 --- a/docutils/test/test_parsers/test_rst/test_literal_blocks.py +++ b/docutils/test/test_parsers/test_rst/test_literal_blocks.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_option_lists.py b/docutils/test/test_parsers/test_rst/test_option_lists.py index c5d1b9251..0eda6623f 100755 --- a/docutils/test/test_parsers/test_rst/test_option_lists.py +++ b/docutils/test/test_parsers/test_rst/test_option_lists.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_outdenting.py b/docutils/test/test_parsers/test_rst/test_outdenting.py index c684c713b..32626357f 100755 --- a/docutils/test/test_parsers/test_rst/test_outdenting.py +++ b/docutils/test/test_parsers/test_rst/test_outdenting.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_paragraphs.py b/docutils/test/test_parsers/test_rst/test_paragraphs.py index 754f315eb..b4c633f73 100755 --- a/docutils/test/test_parsers/test_rst/test_paragraphs.py +++ b/docutils/test/test_parsers/test_rst/test_paragraphs.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_section_headers.py b/docutils/test/test_parsers/test_rst/test_section_headers.py index be18eca41..1ebfd9fc2 100755 --- a/docutils/test/test_parsers/test_rst/test_section_headers.py +++ b/docutils/test/test_parsers/test_rst/test_section_headers.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # -*- coding: utf-8 -*- # $Id$ @@ -8,7 +8,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_source_line.py b/docutils/test/test_parsers/test_rst/test_source_line.py index bd4a967c4..100040d2f 100644 --- a/docutils/test/test_parsers/test_rst/test_source_line.py +++ b/docutils/test/test_parsers/test_rst/test_source_line.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # coding: utf-8 # $Id$ # Author: Günter Milde @@ -24,7 +24,6 @@ adding them to more nodes is regarded a compatible feature extension. # ``test_transforms/test_expose_internals.py``) # to make internal attributes visible. -from __future__ import absolute_import import os if __name__ == '__main__': diff --git a/docutils/test/test_parsers/test_rst/test_substitutions.py b/docutils/test/test_parsers/test_rst/test_substitutions.py index c50937fab..23aafd061 100755 --- a/docutils/test/test_parsers/test_rst/test_substitutions.py +++ b/docutils/test/test_parsers/test_rst/test_substitutions.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_tables.py b/docutils/test/test_parsers/test_rst/test_tables.py index 1524cf665..50cee7f79 100755 --- a/docutils/test/test_parsers/test_rst/test_tables.py +++ b/docutils/test/test_parsers/test_rst/test_tables.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import import os diff --git a/docutils/test/test_parsers/test_rst/test_targets.py b/docutils/test/test_parsers/test_rst/test_targets.py index 8a32ea1df..c2ffe2560 100755 --- a/docutils/test/test_parsers/test_rst/test_targets.py +++ b/docutils/test/test_parsers/test_rst/test_targets.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for states.py. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_parsers/test_rst/test_transitions.py b/docutils/test/test_parsers/test_rst/test_transitions.py index 5d9165510..ac95c7470 100755 --- a/docutils/test/test_parsers/test_rst/test_transitions.py +++ b/docutils/test/test_parsers/test_rst/test_transitions.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for transition markers. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_readers/test_get_reader_class.py b/docutils/test/test_readers/test_get_reader_class.py index 66466e32a..72eb4a20e 100644 --- a/docutils/test/test_readers/test_get_reader_class.py +++ b/docutils/test/test_readers/test_get_reader_class.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: grubert abadger1999 @@ -8,7 +8,6 @@ """ test get_reader_class """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_readers/test_pep/test_inline_markup.py b/docutils/test/test_readers/test_pep/test_inline_markup.py index 8715b9641..e8f2cd82f 100755 --- a/docutils/test/test_readers/test_pep/test_inline_markup.py +++ b/docutils/test/test_readers/test_pep/test_inline_markup.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for inline markup in PEPs (readers/pep.py). """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_readers/test_pep/test_rfc2822.py b/docutils/test/test_readers/test_pep/test_rfc2822.py index 5b20af50f..f5e607a86 100755 --- a/docutils/test/test_readers/test_pep/test_rfc2822.py +++ b/docutils/test/test_readers/test_pep/test_rfc2822.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for RFC-2822 headers in PEPs (readers/pep.py). """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_settings.py b/docutils/test/test_settings.py index c794713f5..544aabaa4 100755 --- a/docutils/test/test_settings.py +++ b/docutils/test/test_settings.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # $Id$ @@ -8,7 +8,6 @@ """ Tests of runtime settings. """ -from __future__ import print_function import sys import os diff --git a/docutils/test/test_statemachine.py b/docutils/test/test_statemachine.py index 14db7f0f1..92ea197f1 100755 --- a/docutils/test/test_statemachine.py +++ b/docutils/test/test_statemachine.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Test module for statemachine.py. """ -from __future__ import print_function import unittest import sys diff --git a/docutils/test/test_transforms/itest_hyperlinks_de.py b/docutils/test/test_transforms/itest_hyperlinks_de.py index 77c32439c..6bfbe94a8 100644 --- a/docutils/test/test_transforms/itest_hyperlinks_de.py +++ b/docutils/test/test_transforms/itest_hyperlinks_de.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -19,8 +19,6 @@ TODO: This test fails currently when run as part of "alltests" because See also https://sourceforge.net/p/docutils/feature-requests/71/ """ -from __future__ import absolute_import - if __name__ == '__main__': import __init__ from test_transforms import DocutilsTestSupport diff --git a/docutils/test/test_transforms/test___init__.py b/docutils/test/test_transforms/test___init__.py index ea74ead64..e216a1d33 100755 --- a/docutils/test/test_transforms/test___init__.py +++ b/docutils/test/test_transforms/test___init__.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: Lea Wiemann <LeWiemann@gmail.com> @@ -7,7 +7,6 @@ """ Test module for transforms/__init__.py. """ -from __future__ import absolute_import import unittest @@ -22,7 +21,7 @@ class TestTransform(transforms.Transform): default_priority = 100 applied = 0 - + def apply(self, **kwargs): self.applied += 1 assert kwargs == {'foo': 42} diff --git a/docutils/test/test_transforms/test_class.py b/docutils/test/test_transforms/test_class.py index 64f015051..e9eeba7d4 100755 --- a/docutils/test/test_transforms/test_class.py +++ b/docutils/test/test_transforms/test_class.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for `docutils.transforms.misc.ClassAttribute`. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_contents.py b/docutils/test/test_transforms/test_contents.py index c9c2015e4..91ace819a 100755 --- a/docutils/test/test_transforms/test_contents.py +++ b/docutils/test/test_transforms/test_contents.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -8,7 +8,6 @@ Tests for `docutils.transforms.parts.Contents` (via `docutils.transforms.universal.LastReaderPending`). """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_docinfo.py b/docutils/test/test_transforms/test_docinfo.py index 5f945ae64..1fe21cfe5 100755 --- a/docutils/test/test_transforms/test_docinfo.py +++ b/docutils/test/test_transforms/test_docinfo.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # -*- coding: utf-8 -*- # $Id$ @@ -8,7 +8,6 @@ """ Tests for docutils.transforms.frontmatter.DocInfo. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_doctitle.py b/docutils/test/test_transforms/test_doctitle.py index ac6bd9153..a09f1d549 100755 --- a/docutils/test/test_transforms/test_doctitle.py +++ b/docutils/test/test_transforms/test_doctitle.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for docutils.transforms.frontmatter.DocTitle. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_expose_internals.py b/docutils/test/test_transforms/test_expose_internals.py index 5a9ec4cbf..b4835efe9 100755 --- a/docutils/test/test_transforms/test_expose_internals.py +++ b/docutils/test/test_transforms/test_expose_internals.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: Lea Wiemann <LeWiemann@gmail.com> @@ -7,8 +7,6 @@ """ Test module for universal.ExposeInternals transform. """ -from __future__ import absolute_import - if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_filter.py b/docutils/test/test_transforms/test_filter.py index 363f57bbe..3120393d4 100755 --- a/docutils/test/test_transforms/test_filter.py +++ b/docutils/test/test_transforms/test_filter.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for docutils.transforms.components.Filter. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_footnotes.py b/docutils/test/test_transforms/test_footnotes.py index f3bf94cea..880d3d245 100755 --- a/docutils/test/test_transforms/test_footnotes.py +++ b/docutils/test/test_transforms/test_footnotes.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for docutils.transforms.references.Footnotes. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_hyperlinks.py b/docutils/test/test_transforms/test_hyperlinks.py index b20b05284..366334d5c 100755 --- a/docutils/test/test_transforms/test_hyperlinks.py +++ b/docutils/test/test_transforms/test_hyperlinks.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for docutils.transforms.references.Hyperlinks. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_messages.py b/docutils/test/test_transforms/test_messages.py index 7a315bc05..2b2a7b063 100755 --- a/docutils/test/test_transforms/test_messages.py +++ b/docutils/test/test_transforms/test_messages.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for docutils.transforms.universal.Messages. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_peps.py b/docutils/test/test_transforms/test_peps.py index 5057f83ca..f9dac365b 100755 --- a/docutils/test/test_transforms/test_peps.py +++ b/docutils/test/test_transforms/test_peps.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for docutils.transforms.peps. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_sectnum.py b/docutils/test/test_transforms/test_sectnum.py index c2b3ac1bf..93c462a6d 100755 --- a/docutils/test/test_transforms/test_sectnum.py +++ b/docutils/test/test_transforms/test_sectnum.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Authors: David Goodger <goodger@python.org>; Dmitry Jemerov @@ -8,7 +8,6 @@ Tests for `docutils.transforms.parts.SectNum` (via `docutils.transforms.universal.LastReaderPending`). """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_smartquotes.py b/docutils/test/test_transforms/test_smartquotes.py index 5a8a3c175..a82342703 100644 --- a/docutils/test/test_transforms/test_smartquotes.py +++ b/docutils/test/test_transforms/test_smartquotes.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python33 # -*- coding: utf-8 -*- # $Id$ # @@ -16,7 +16,6 @@ """ Test module for universal.SmartQuotes transform. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_strip_comments.py b/docutils/test/test_transforms/test_strip_comments.py index 563894054..8b8e95abd 100755 --- a/docutils/test/test_transforms/test_strip_comments.py +++ b/docutils/test/test_transforms/test_strip_comments.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for docutils.transforms.universal.StripComments. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_strip_elements_with_class.py b/docutils/test/test_transforms/test_strip_elements_with_class.py index d15bf03c7..0be7b718f 100644 --- a/docutils/test/test_transforms/test_strip_elements_with_class.py +++ b/docutils/test/test_transforms/test_strip_elements_with_class.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: Guenter Milde <milde@users.sf.net> @@ -7,7 +7,6 @@ """ Tests for docutils.transforms.universal.StripClassesAndElements. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_substitution_expansion_length_limit.py b/docutils/test/test_transforms/test_substitution_expansion_length_limit.py index 43c83a15a..2218c8d83 100644 --- a/docutils/test/test_transforms/test_substitution_expansion_length_limit.py +++ b/docutils/test/test_transforms/test_substitution_expansion_length_limit.py @@ -7,7 +7,6 @@ """ Tests for docutils.transforms.references.Substitutions. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_substitutions.py b/docutils/test/test_transforms/test_substitutions.py index 9854a6e1f..370901064 100755 --- a/docutils/test/test_transforms/test_substitutions.py +++ b/docutils/test/test_transforms/test_substitutions.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for docutils.transforms.references.Substitutions. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_target_notes.py b/docutils/test/test_transforms/test_target_notes.py index 21d4d6b43..1bd98b848 100755 --- a/docutils/test/test_transforms/test_target_notes.py +++ b/docutils/test/test_transforms/test_target_notes.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -8,7 +8,6 @@ Tests for `docutils.transforms.references.TargetNotes` (via `docutils.transforms.universal.LastReaderPending`). """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_transitions.py b/docutils/test/test_transforms/test_transitions.py index 318c8b1e6..c098e9e8e 100755 --- a/docutils/test/test_transforms/test_transitions.py +++ b/docutils/test/test_transforms/test_transitions.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Test module for misc.Transitions transform. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_transforms/test_writer_aux.py b/docutils/test/test_transforms/test_writer_aux.py index 751b3fbc4..2eb00dc5e 100755 --- a/docutils/test/test_transforms/test_writer_aux.py +++ b/docutils/test/test_transforms/test_writer_aux.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: Lea Wiemann <LeWiemann@gmail.com> @@ -7,7 +7,6 @@ """ Test module for writer_aux transforms. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_writers/test_docutils_xml.py b/docutils/test/test_writers/test_docutils_xml.py index 86373ff30..5b3b93308 100755 --- a/docutils/test/test_writers/test_docutils_xml.py +++ b/docutils/test/test_writers/test_docutils_xml.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # $Id$ # Author: Lea Wiemann <LeWiemann@gmail.com> @@ -13,7 +13,6 @@ Test for docutils XML writer. ``<empty></empty>`` vs. ``<empty/>``. The sample strings in this test module mirrors the current behaviour of the docutils_xml writer. """ -from __future__ import absolute_import import sys diff --git a/docutils/test/test_writers/test_get_writer_class.py b/docutils/test/test_writers/test_get_writer_class.py index c9720e371..f347db68d 100644 --- a/docutils/test/test_writers/test_get_writer_class.py +++ b/docutils/test/test_writers/test_get_writer_class.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: grubert @@ -8,7 +8,6 @@ """ test get_writer_class """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ @@ -34,4 +33,3 @@ class GetWriterClassTestCase(DocutilsTestSupport.StandardTestCase): if __name__ == '__main__': import unittest unittest.main() - diff --git a/docutils/test/test_writers/test_html4css1_misc.py b/docutils/test/test_writers/test_html4css1_misc.py index 2dbc8f2b6..ae530abc5 100755 --- a/docutils/test/test_writers/test_html4css1_misc.py +++ b/docutils/test/test_writers/test_html4css1_misc.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # coding: utf-8 # $Id$ @@ -9,7 +9,6 @@ """ Miscellaneous HTML writer tests. """ -from __future__ import absolute_import import os diff --git a/docutils/test/test_writers/test_html4css1_parts.py b/docutils/test/test_writers/test_html4css1_parts.py index f2a2dcd57..c6250d57b 100755 --- a/docutils/test/test_writers/test_html4css1_parts.py +++ b/docutils/test/test_writers/test_html4css1_parts.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: reggie dugard <reggie@users.sourceforge.net> @@ -11,7 +11,6 @@ Note: the 'body' and 'whole' entries have been removed from the parts dictionaries (redundant), along with 'meta' and 'stylesheet' entries with standard values, and any entries with empty values. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_writers/test_html4css1_template.py b/docutils/test/test_writers/test_html4css1_template.py index 41352a5c7..ed0d51245 100755 --- a/docutils/test/test_writers/test_html4css1_template.py +++ b/docutils/test/test_writers/test_html4css1_template.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for the HTML writer. """ -from __future__ import absolute_import import os import platform diff --git a/docutils/test/test_writers/test_html5_polyglot_misc.py b/docutils/test/test_writers/test_html5_polyglot_misc.py index b9b5dadd0..06fdccd01 100644 --- a/docutils/test/test_writers/test_html5_polyglot_misc.py +++ b/docutils/test/test_writers/test_html5_polyglot_misc.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # coding: utf-8 # $Id$ @@ -9,7 +9,6 @@ """ Miscellaneous HTML writer tests. """ -from __future__ import absolute_import import os import warnings @@ -151,7 +150,7 @@ class SettingsTestCase(DocutilsTestSupport.StandardTestCase): settings_overrides=mysettings) self.assertEqual(len(wng), 1, "Expected FutureWarning.") assert issubclass(wng[0].category, FutureWarning) - + class MathTestCase(DocutilsTestSupport.StandardTestCase): diff --git a/docutils/test/test_writers/test_html5_polyglot_parts.py b/docutils/test/test_writers/test_html5_polyglot_parts.py index 4f6876c86..087a3006a 100644 --- a/docutils/test/test_writers/test_html5_polyglot_parts.py +++ b/docutils/test/test_writers/test_html5_polyglot_parts.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: reggie dugard <reggie@users.sourceforge.net> @@ -11,7 +11,6 @@ Note: the 'body' and 'whole' entries have been removed from the parts dictionaries (redundant), along with 'meta' and 'stylesheet' entries with standard values, and any entries with empty values. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_writers/test_latex2e.py b/docutils/test/test_writers/test_latex2e.py index b1bfee605..58c723bf1 100755 --- a/docutils/test/test_writers/test_latex2e.py +++ b/docutils/test/test_writers/test_latex2e.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # -*- coding: utf-8 -*- # $Id$ @@ -8,7 +8,6 @@ """ Tests for latex2e writer. """ -from __future__ import absolute_import import string diff --git a/docutils/test/test_writers/test_latex2e_misc.py b/docutils/test/test_writers/test_latex2e_misc.py index ecbb9983e..55ba6d16d 100644 --- a/docutils/test/test_writers/test_latex2e_misc.py +++ b/docutils/test/test_writers/test_latex2e_misc.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # coding: utf-8 # $Id$ @@ -17,7 +17,6 @@ """ Miscellaneous LaTeX writer tests. """ -from __future__ import absolute_import import warnings if __name__ == '__main__': diff --git a/docutils/test/test_writers/test_manpage.py b/docutils/test/test_writers/test_manpage.py index b968a4ede..2631c40a2 100644 --- a/docutils/test/test_writers/test_manpage.py +++ b/docutils/test/test_writers/test_manpage.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id: test_latex2e.py 6003 2009-06-27 20:44:09Z milde $ # Author: engelbert gruber <grubert@users.sourceforge.net> @@ -7,7 +7,6 @@ """ Tests for manpage writer. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_writers/test_null.py b/docutils/test/test_writers/test_null.py index 54ecb3f59..4e03709d9 100755 --- a/docutils/test/test_writers/test_null.py +++ b/docutils/test/test_writers/test_null.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # $Id$ # Author: Lea Wiemann <LeWiemann@gmail.com> @@ -7,7 +7,6 @@ """ Test for Null writer. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ diff --git a/docutils/test/test_writers/test_odt.py b/docutils/test/test_writers/test_odt.py index 05a362b67..2126bf933 100755 --- a/docutils/test/test_writers/test_odt.py +++ b/docutils/test/test_writers/test_odt.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # $Id$ # Author: Dave Kuhlman <dkuhlman@rexx.com> @@ -29,7 +29,6 @@ Instructions for adding a new test: 5. If any other tests fail, that's a possible regression. """ -from __future__ import absolute_import import os import zipfile @@ -51,7 +50,7 @@ EXPECTED_PATH = 'functional/expected/' class DocutilsOdtTestCase(DocutilsTestSupport.StandardTestCase): - def process_test(self, input_filename, expected_filename, + def process_test(self, input_filename, expected_filename, save_output_name=None, settings_overrides=None): # Test that xmlcharrefreplace is the default output encoding # error handler. @@ -87,7 +86,7 @@ class DocutilsOdtTestCase(DocutilsTestSupport.StandardTestCase): def reorder_attributes(self, root): """ - Make attribute order independent of python version. + Make attribute order independent of python version. python3.8 is different to previous. """ for el in root.iter(): diff --git a/docutils/test/test_writers/test_pseudoxml.py b/docutils/test/test_writers/test_pseudoxml.py index 6a9c9806d..3cc14329c 100755 --- a/docutils/test/test_writers/test_pseudoxml.py +++ b/docutils/test/test_writers/test_pseudoxml.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # $Id: test_pseudoxml.py 8481 2020-01-31 08:17:24Z milde $ # Author: Lea Wiemann <LeWiemann@gmail.com> @@ -7,7 +7,6 @@ """ Test for pseudo-XML writer. """ -from __future__ import absolute_import if __name__ == '__main__': import __init__ @@ -34,7 +33,7 @@ This is a paragraph. ---------- -This is a paragraph +This is a paragraph with \escaped \characters. A Section @@ -60,9 +59,9 @@ Foo. ] totest_detailed['basic'] = [ -# input +# input [totest['basic'][0][0], -# output +# output """\ <document source="<string>"> <paragraph> diff --git a/docutils/test/test_writers/test_s5.py b/docutils/test/test_writers/test_s5.py index 56030ce4b..5fe5263b8 100755 --- a/docutils/test/test_writers/test_s5.py +++ b/docutils/test/test_writers/test_s5.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -7,7 +7,6 @@ """ Tests for the S5/HTML writer. """ -from __future__ import absolute_import import os import platform diff --git a/docutils/tools/dev/create_unimap.py b/docutils/tools/dev/create_unimap.py index e08dbea9c..eba354208 100755 --- a/docutils/tools/dev/create_unimap.py +++ b/docutils/tools/dev/create_unimap.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # $Id$ # Author: Lea Wiemann <LeWiemann@gmail.com> @@ -9,7 +9,6 @@ # Get unicode.xml from # <http://www.w3.org/2003/entities/xml/unicode.xml>. -from __future__ import print_function from xml.dom import minidom import sys import pprint diff --git a/docutils/tools/dev/generate_punctuation_chars.py b/docutils/tools/dev/generate_punctuation_chars.py index 2ca923d70..cc6c67229 100644 --- a/docutils/tools/dev/generate_punctuation_chars.py +++ b/docutils/tools/dev/generate_punctuation_chars.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # :Copyright: © 2011, 2017 Günter Milde. # :License: Released under the terms of the `2-Clause BSD license`_, in short: @@ -33,8 +33,6 @@ # .. _inline markup recognition rules: # ../../docs/ref/rst/restructuredtext.html#inline-markup -from __future__ import print_function - import sys import unicodedata @@ -50,7 +48,7 @@ else: # # Problem: ``ur`` prefix fails with Py 3.5 :: -module_template = u'''#!/usr/bin/env python +module_template = u'''#!/usr/bin/env python3 # -*- coding: utf-8 -*- # :Id: $Id$ # :Copyright: © 2011, 2017 Günter Milde. diff --git a/docutils/tools/dev/profile_docutils.py b/docutils/tools/dev/profile_docutils.py index f6576d1ad..8a54c0f92 100755 --- a/docutils/tools/dev/profile_docutils.py +++ b/docutils/tools/dev/profile_docutils.py @@ -1,10 +1,9 @@ -#!/usr/bin/python -i +#!/usr/bin/python3 -i # $Id$ # Author: Lea Wiemann <LeWiemann@gmail.com> # Copyright: This script has been placed in the public domain. -from __future__ import print_function import os.path import docutils.core import hotshot.stats diff --git a/docutils/tools/dev/unicode2rstsubs.py b/docutils/tools/dev/unicode2rstsubs.py index 24b259bda..d202c93d5 100755 --- a/docutils/tools/dev/unicode2rstsubs.py +++ b/docutils/tools/dev/unicode2rstsubs.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 # $Id$ # Author: David Goodger <goodger@python.org> @@ -19,7 +19,6 @@ The input file, unicode.xml, is maintained as part of the MathML 2 Recommentation XML source, and is available from <http://www.w3.org/2003/entities/xml/>. """ -from __future__ import print_function import sys import os diff --git a/docutils/tools/quicktest.py b/docutils/tools/quicktest.py index dd6d993fe..0ada37da7 100755 --- a/docutils/tools/quicktest.py +++ b/docutils/tools/quicktest.py @@ -1,11 +1,10 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # $Id$ # Authors: Garth Kidd <garth@deadlybloodyserious.com>; # David Goodger <goodger@python.org> # Copyright: This module has been placed in the public domain. -from __future__ import print_function try: import locale locale.setlocale(locale.LC_ALL, '') diff --git a/docutils/tools/rst2odt_prepstyles.py b/docutils/tools/rst2odt_prepstyles.py index d6ccaa9ae..27f25da1c 100755 --- a/docutils/tools/rst2odt_prepstyles.py +++ b/docutils/tools/rst2odt_prepstyles.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # $Id$ # Author: Dave Kuhlman <dkuhlman@rexx.com> @@ -11,8 +11,6 @@ specifications from styles.xml in STYLE_FILE.odt. # Author: Michael Schutte <michi@uiae.at> -from __future__ import print_function - from lxml import etree import sys import zipfile |