diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/coveragetest.py | 9 | ||||
| -rw-r--r-- | tests/test_api.py | 7 | ||||
| -rw-r--r-- | tests/test_debug.py | 4 | ||||
| -rw-r--r-- | tests/test_html.py | 7 | ||||
| -rw-r--r-- | tests/test_plugins.py | 11 | ||||
| -rw-r--r-- | tests/test_summary.py | 8 |
6 files changed, 24 insertions, 22 deletions
diff --git a/tests/coveragetest.py b/tests/coveragetest.py index 415dd4ab..2a55cf8b 100644 --- a/tests/coveragetest.py +++ b/tests/coveragetest.py @@ -7,6 +7,7 @@ import contextlib import datetime import difflib import glob +import io import os import os.path import random @@ -18,7 +19,7 @@ import pytest import coverage from coverage import env -from coverage.backward import StringIO, import_local_file, string_class, shlex_quote +from coverage.backward import import_local_file from coverage.cmdline import CoverageScript from tests.helpers import arcs_to_arcz_repr, arcz_to_arcs, assert_count_equal @@ -176,7 +177,7 @@ class CoverageTest( assert False, "None of the lines choices matched %r" % (statements,) missing_formatted = analysis.missing_formatted() - if isinstance(missing, string_class): + if isinstance(missing, str): msg = "{!r} != {!r}".format(missing_formatted, missing) assert missing_formatted == missing, msg else: @@ -202,7 +203,7 @@ class CoverageTest( assert False, msg if report: - frep = StringIO() + frep = io.StringIO() cov.report(mod, file=frep, show_missing=True) rep = " ".join(frep.getvalue().split("\n")[2].split()[1:]) assert report == rep, "{!r} != {!r}".format(report, rep) @@ -380,7 +381,7 @@ class CoverageTest( else: command_words = [command_name] - cmd = " ".join([shlex_quote(w) for w in command_words] + command_args) + cmd = " ".join([shlex.quote(w) for w in command_words] + command_args) # Add our test modules directory to PYTHONPATH. I'm sure there's too # much path munging here, but... diff --git a/tests/test_api.py b/tests/test_api.py index f24beaf4..6eff06fe 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -5,6 +5,7 @@ import fnmatch import glob +import io import os import os.path import re @@ -16,7 +17,7 @@ import pytest import coverage from coverage import env -from coverage.backward import code_object, import_local_file, StringIO +from coverage.backward import code_object, import_local_file from coverage.data import line_counts from coverage.files import abs_file, relative_filename from coverage.misc import CoverageException @@ -945,7 +946,7 @@ class ReportIncludeOmitTest(IncludeOmitTestsMixin, CoverageTest): cov.start() import usepkgs # pragma: nested # pylint: disable=import-error, unused-import cov.stop() # pragma: nested - report = StringIO() + report = io.StringIO() cov.report(file=report, **kwargs) return report.getvalue() @@ -1070,7 +1071,7 @@ class TestRunnerPluginTest(CoverageTest): self.start_import_stop(cov, "prog") cov.combine() cov.save() - report = StringIO() + report = io.StringIO() cov.report(show_missing=None, ignore_errors=True, file=report, skip_covered=None, skip_empty=None) assert report.getvalue() == textwrap.dedent("""\ diff --git a/tests/test_debug.py b/tests/test_debug.py index cb83e519..50f191c6 100644 --- a/tests/test_debug.py +++ b/tests/test_debug.py @@ -3,6 +3,7 @@ """Tests of coverage/debug.py""" +import io import os import re @@ -10,7 +11,6 @@ import pytest import coverage from coverage import env -from coverage.backward import StringIO from coverage.debug import filter_text, info_formatter, info_header, short_id, short_stack from coverage.debug import clipped_repr @@ -106,7 +106,7 @@ class DebugTraceTest(CoverageTest): f1(i) """) - debug_out = StringIO() + debug_out = io.StringIO() cov = coverage.Coverage(debug=debug) cov._debug_file = debug_out self.start_import_stop(cov, "f1") diff --git a/tests/test_html.py b/tests/test_html.py index c0413c5a..c561a5d2 100644 --- a/tests/test_html.py +++ b/tests/test_html.py @@ -16,7 +16,6 @@ import mock import pytest import coverage -from coverage.backward import unicode_class from coverage import env from coverage.files import abs_file, flat_rootname import coverage.html @@ -629,12 +628,12 @@ def compare_html(expected, actual): (r'<span class="(nam|key)">(print|True|False)</span>', r'<span class="nam">\2</span>'), # Occasionally an absolute path is in the HTML report. (filepath_to_regex(TESTS_DIR), 'TESTS_DIR'), - (filepath_to_regex(flat_rootname(unicode_class(TESTS_DIR))), '_TESTS_DIR'), + (filepath_to_regex(flat_rootname(str(TESTS_DIR))), '_TESTS_DIR'), # The temp dir the tests make. (filepath_to_regex(os.getcwd()), 'TEST_TMPDIR'), - (filepath_to_regex(flat_rootname(unicode_class(os.getcwd()))), '_TEST_TMPDIR'), + (filepath_to_regex(flat_rootname(str(os.getcwd()))), '_TEST_TMPDIR'), (filepath_to_regex(abs_file(os.getcwd())), 'TEST_TMPDIR'), - (filepath_to_regex(flat_rootname(unicode_class(abs_file(os.getcwd())))), '_TEST_TMPDIR'), + (filepath_to_regex(flat_rootname(str(abs_file(os.getcwd())))), '_TEST_TMPDIR'), (r'/private/var/folders/[\w/]{35}/coverage_test/tests_test_html_\w+_\d{8}', 'TEST_TMPDIR'), (r'_private_var_folders_\w{35}_coverage_test_tests_test_html_\w+_\d{8}', '_TEST_TMPDIR'), ] diff --git a/tests/test_plugins.py b/tests/test_plugins.py index 59be645c..5a8d92ee 100644 --- a/tests/test_plugins.py +++ b/tests/test_plugins.py @@ -4,6 +4,7 @@ """Tests for plugins.""" import inspect +import io import os.path from xml.etree import ElementTree @@ -11,7 +12,7 @@ import pytest import coverage from coverage import env -from coverage.backward import StringIO, import_local_file +from coverage.backward import import_local_file from coverage.data import line_counts from coverage.control import Plugins from coverage.misc import CoverageException @@ -188,7 +189,7 @@ class PluginTest(CoverageTest): def coverage_init(reg, options): reg.add_file_tracer(Plugin()) """) - debug_out = StringIO() + debug_out = io.StringIO() cov = coverage.Coverage(debug=["sys"]) cov._debug_file = debug_out cov.set_option("run:plugins", ["plugin_sys_info"]) @@ -218,7 +219,7 @@ class PluginTest(CoverageTest): def coverage_init(reg, options): reg.add_configurer(Plugin()) """) - debug_out = StringIO() + debug_out = io.StringIO() cov = coverage.Coverage(debug=["sys"]) cov._debug_file = debug_out cov.set_option("run:plugins", ["plugin_no_sys_info"]) @@ -411,7 +412,7 @@ class GoodFileTracerTest(FileTracerTest): self.start_import_stop(cov, "caller") - repout = StringIO() + repout = io.StringIO() total = cov.report(file=repout, include=["*.html"], omit=["uni*.html"], show_missing=True) report = repout.getvalue().splitlines() expected = [ @@ -511,7 +512,7 @@ class GoodFileTracerTest(FileTracerTest): cov.set_option("run:plugins", ["fairly_odd_plugin"]) self.start_import_stop(cov, "unsuspecting") - repout = StringIO() + repout = io.StringIO() total = cov.report(file=repout, show_missing=True) report = repout.getvalue().splitlines() expected = [ diff --git a/tests/test_summary.py b/tests/test_summary.py index b6405bff..b00ee96b 100644 --- a/tests/test_summary.py +++ b/tests/test_summary.py @@ -5,6 +5,7 @@ """Test text-based summary reporting for coverage.py""" import glob +import io import os import os.path import py_compile @@ -13,7 +14,6 @@ import re import pytest import coverage -from coverage.backward import StringIO from coverage import env from coverage.control import Coverage from coverage.data import CoverageData @@ -655,7 +655,7 @@ class SummaryTest(UsingModulesMixin, CoverageTest): def get_report(self, cov): """Get the report from `cov`, and canonicalize it.""" - repout = StringIO() + repout = io.StringIO() cov.report(file=repout, show_missing=False) report = repout.getvalue().replace('\\', '/') report = re.sub(r" +", " ", report) @@ -779,7 +779,7 @@ class SummaryTest(UsingModulesMixin, CoverageTest): import usepkgs # pragma: nested # pylint: disable=import-error, unused-import cov.stop() # pragma: nested - repout = StringIO() + repout = io.StringIO() cov.report(file=repout, show_missing=False) report = repout.getvalue().replace('\\', '/') @@ -857,7 +857,7 @@ class SummaryReporterConfigurationTest(CoverageTest): for name, value in options: cov.set_option(name, value) printer = SummaryReporter(cov) - destination = StringIO() + destination = io.StringIO() printer.report([], destination) return destination.getvalue() |