diff options
28 files changed, 99 insertions, 96 deletions
@@ -107,7 +107,7 @@ def run_tests_with_coverage(tracer, *nose_args): version = "%s%s" % sys.version_info[:2] suffix = "%s_%s_%s" % (version, tracer, socket.gethostname()) - cov = coverage.coverage(config_file="metacov.ini", data_suffix=suffix) + cov = coverage.Coverage(config_file="metacov.ini", data_suffix=suffix) # Cheap trick: the coverage.py code itself is excluded from measurement, # but if we clobber the cover_prefix in the coverage object, we can defeat # the self-detection. @@ -149,7 +149,7 @@ def do_combine_html(): """Combine data from a meta-coverage run, and make the HTML report.""" import coverage os.environ['COVERAGE_HOME'] = os.getcwd() - cov = coverage.coverage(config_file="metacov.ini") + cov = coverage.Coverage(config_file="metacov.ini") cov.load() cov.combine() cov.save() diff --git a/tests/coveragetest.py b/tests/coveragetest.py index 5a1de913..f06c6244 100644 --- a/tests/coveragetest.py +++ b/tests/coveragetest.py @@ -175,7 +175,7 @@ class CoverageTest( """ # We write the code into a file so that we can import it. - # Coverage wants to deal with things as modules with file names. + # Coverage.py wants to deal with things as modules with file names. modname = self.get_module_name() self.make_file(modname+".py", text) @@ -187,8 +187,8 @@ class CoverageTest( if arcs_unpredicted is None and arcz_unpredicted is not None: arcs_unpredicted = self.arcz_to_arcs(arcz_unpredicted) - # Start up Coverage. - cov = coverage.coverage(branch=(arcs_missing is not None)) + # Start up coverage.py. + cov = coverage.Coverage(branch=(arcs_missing is not None)) cov.erase() for exc in excludes or []: cov.exclude(exc) diff --git a/tests/farm/html/run_a.py b/tests/farm/html/run_a.py index 48790fd5..1ec6220f 100644 --- a/tests/farm/html/run_a.py +++ b/tests/farm/html/run_a.py @@ -4,7 +4,7 @@ def html_it(): """Run coverage.py and make an HTML report for a.""" import coverage - cov = coverage.coverage() + cov = coverage.Coverage() cov.start() import a # pragma: nested cov.stop() # pragma: nested diff --git a/tests/farm/html/run_a_xml_1.py b/tests/farm/html/run_a_xml_1.py index 33950c9d..e1bf1828 100644 --- a/tests/farm/html/run_a_xml_1.py +++ b/tests/farm/html/run_a_xml_1.py @@ -6,7 +6,7 @@ source_path = None def html_it(): """Run coverage.py and make an XML report for a.""" import coverage, coverage.files - cov = coverage.coverage() + cov = coverage.Coverage() cov.start() import a # pragma: nested cov.stop() # pragma: nested diff --git a/tests/farm/html/run_a_xml_2.py b/tests/farm/html/run_a_xml_2.py index c048c6a3..f53e04aa 100644 --- a/tests/farm/html/run_a_xml_2.py +++ b/tests/farm/html/run_a_xml_2.py @@ -6,7 +6,7 @@ source_path = None def html_it(): """Run coverage.py and make an XML report for a.""" import coverage, coverage.files - cov = coverage.coverage(config_file="run_a_xml_2.ini") + cov = coverage.Coverage(config_file="run_a_xml_2.ini") cov.start() import a # pragma: nested cov.stop() # pragma: nested diff --git a/tests/farm/html/run_b_branch.py b/tests/farm/html/run_b_branch.py index ecb812de..2451f069 100644 --- a/tests/farm/html/run_b_branch.py +++ b/tests/farm/html/run_b_branch.py @@ -4,7 +4,7 @@ def html_it(): """Run coverage.py with branches and make an HTML report for b.""" import coverage - cov = coverage.coverage(branch=True) + cov = coverage.Coverage(branch=True) cov.start() import b # pragma: nested cov.stop() # pragma: nested diff --git a/tests/farm/html/run_bom.py b/tests/farm/html/run_bom.py index 17f0b3ca..a34fab9f 100644 --- a/tests/farm/html/run_bom.py +++ b/tests/farm/html/run_bom.py @@ -6,7 +6,7 @@ import sys def html_it(): """Run coverage.py and make an HTML report for bom.py.""" import coverage - cov = coverage.coverage() + cov = coverage.Coverage() cov.start() import bom # pragma: nested cov.stop() # pragma: nested diff --git a/tests/farm/html/run_isolatin1.py b/tests/farm/html/run_isolatin1.py index 009bafdd..6729a275 100644 --- a/tests/farm/html/run_isolatin1.py +++ b/tests/farm/html/run_isolatin1.py @@ -6,7 +6,7 @@ import sys def html_it(): """Run coverage.py and make an HTML report for isolatin1.py.""" import coverage - cov = coverage.coverage() + cov = coverage.Coverage() cov.start() import isolatin1 # pragma: nested cov.stop() # pragma: nested diff --git a/tests/farm/html/run_omit_1.py b/tests/farm/html/run_omit_1.py index bf592f92..137d37ca 100644 --- a/tests/farm/html/run_omit_1.py +++ b/tests/farm/html/run_omit_1.py @@ -4,7 +4,7 @@ def html_it(): """Run coverage.py and make an HTML report for main.""" import coverage - cov = coverage.coverage(include=["./*"]) + cov = coverage.Coverage(include=["./*"]) cov.start() import main # pragma: nested cov.stop() # pragma: nested diff --git a/tests/farm/html/run_omit_2.py b/tests/farm/html/run_omit_2.py index 68f75990..dd021b96 100644 --- a/tests/farm/html/run_omit_2.py +++ b/tests/farm/html/run_omit_2.py @@ -4,7 +4,7 @@ def html_it(): """Run coverage.py and make an HTML report for main.""" import coverage - cov = coverage.coverage(include=["./*"]) + cov = coverage.Coverage(include=["./*"]) cov.start() import main # pragma: nested cov.stop() # pragma: nested diff --git a/tests/farm/html/run_omit_3.py b/tests/farm/html/run_omit_3.py index f30ae5f1..96ed0822 100644 --- a/tests/farm/html/run_omit_3.py +++ b/tests/farm/html/run_omit_3.py @@ -4,7 +4,7 @@ def html_it(): """Run coverage.py and make an HTML report for main.""" import coverage - cov = coverage.coverage(include=["./*"]) + cov = coverage.Coverage(include=["./*"]) cov.start() import main # pragma: nested cov.stop() # pragma: nested diff --git a/tests/farm/html/run_omit_4.py b/tests/farm/html/run_omit_4.py index 7f50a53c..b212ef40 100644 --- a/tests/farm/html/run_omit_4.py +++ b/tests/farm/html/run_omit_4.py @@ -4,7 +4,7 @@ def html_it(): """Run coverage.py and make an HTML report for main.""" import coverage - cov = coverage.coverage(config_file="omit4.ini", include=["./*"]) + cov = coverage.Coverage(config_file="omit4.ini", include=["./*"]) cov.start() import main # pragma: nested cov.stop() # pragma: nested diff --git a/tests/farm/html/run_omit_5.py b/tests/farm/html/run_omit_5.py index 2f1d7769..ed61d209 100644 --- a/tests/farm/html/run_omit_5.py +++ b/tests/farm/html/run_omit_5.py @@ -4,7 +4,7 @@ def html_it(): """Run coverage.py and make an HTML report for main.""" import coverage - cov = coverage.coverage(config_file="omit5.ini", include=["./*"]) + cov = coverage.Coverage(config_file="omit5.ini", include=["./*"]) cov.start() import main # pragma: nested cov.stop() # pragma: nested diff --git a/tests/farm/html/run_other.py b/tests/farm/html/run_other.py index 2557bb51..92753d4b 100644 --- a/tests/farm/html/run_other.py +++ b/tests/farm/html/run_other.py @@ -4,7 +4,7 @@ def html_it(): """Run coverage.py and make an HTML report for everything.""" import coverage - cov = coverage.coverage(include=["./*", "../othersrc/*"]) + cov = coverage.Coverage(include=["./*", "../othersrc/*"]) cov.start() import here # pragma: nested cov.stop() # pragma: nested diff --git a/tests/farm/html/run_partial.py b/tests/farm/html/run_partial.py index d9d089e7..fedf7082 100644 --- a/tests/farm/html/run_partial.py +++ b/tests/farm/html/run_partial.py @@ -6,7 +6,7 @@ import sys def html_it(): """Run coverage.py and make an HTML report for partial.""" import coverage - cov = coverage.coverage(branch=True) + cov = coverage.Coverage(branch=True) cov.start() import partial # pragma: nested cov.stop() # pragma: nested diff --git a/tests/farm/html/run_styled.py b/tests/farm/html/run_styled.py index ad9b0275..eeebfe61 100644 --- a/tests/farm/html/run_styled.py +++ b/tests/farm/html/run_styled.py @@ -4,7 +4,7 @@ def html_it(): """Run coverage.py and make an HTML report for a.""" import coverage - cov = coverage.coverage() + cov = coverage.Coverage() cov.start() import a # pragma: nested cov.stop() # pragma: nested diff --git a/tests/farm/html/run_tabbed.py b/tests/farm/html/run_tabbed.py index b2e02cb6..6dacff53 100644 --- a/tests/farm/html/run_tabbed.py +++ b/tests/farm/html/run_tabbed.py @@ -4,7 +4,7 @@ def html_it(): """Run coverage.py and make an HTML report for tabbed.""" import coverage - cov = coverage.coverage() + cov = coverage.Coverage() cov.start() import tabbed # pragma: nested cov.stop() # pragma: nested diff --git a/tests/farm/html/run_unicode.py b/tests/farm/html/run_unicode.py index 698c2828..888d7e54 100644 --- a/tests/farm/html/run_unicode.py +++ b/tests/farm/html/run_unicode.py @@ -4,7 +4,7 @@ def html_it(): """Run coverage.py and make an HTML report for unicode.py.""" import coverage - cov = coverage.coverage() + cov = coverage.Coverage() cov.start() import unicode # pragma: nested cov.stop() # pragma: nested diff --git a/tests/farm/html/run_y_xml_branch.py b/tests/farm/html/run_y_xml_branch.py index 577f1ce0..9d3aba2f 100644 --- a/tests/farm/html/run_y_xml_branch.py +++ b/tests/farm/html/run_y_xml_branch.py @@ -6,7 +6,7 @@ source_path = None def xml_it(): """Run coverage.py and make an XML report for y.""" import coverage, coverage.files - cov = coverage.coverage(branch=True) + cov = coverage.Coverage(branch=True) cov.start() import y # pragma: nested cov.stop() # pragma: nested diff --git a/tests/test_api.py b/tests/test_api.py index 5169239f..dc472c0f 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -36,7 +36,7 @@ class ApiTest(CoverageTest): self.assertCountEqual(here, files) def test_unexecuted_file(self): - cov = coverage.coverage() + cov = coverage.Coverage() self.make_file("mycode.py", """\ a = 1 @@ -69,7 +69,7 @@ class ApiTest(CoverageTest): """) # Import the Python file, executing it. - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "mymain") filename, _, _, _ = cov.analysis("mymain.py") @@ -84,7 +84,7 @@ class ApiTest(CoverageTest): # Import the Python file, executing it again, once it's been compiled # already. - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "mymain") filename, _, _, _ = cov.analysis("mymain.py") @@ -105,7 +105,7 @@ class ApiTest(CoverageTest): """) # Measure without the stdlib. - cov1 = coverage.coverage() + cov1 = coverage.Coverage() self.assertEqual(cov1.config.cover_pylib, False) self.start_import_stop(cov1, "mymain") @@ -117,7 +117,7 @@ class ApiTest(CoverageTest): self.assertEqual(statements, missing) # Measure with the stdlib. - cov2 = coverage.coverage(cover_pylib=True) + cov2 = coverage.Coverage(cover_pylib=True) self.start_import_stop(cov2, "mymain") # some statements were marked executed in mymain.py @@ -136,7 +136,7 @@ class ApiTest(CoverageTest): """) # Measure without the stdlib, but include colorsys. - cov1 = coverage.coverage(cover_pylib=False, include=["*/colorsys.py"]) + cov1 = coverage.Coverage(cover_pylib=False, include=["*/colorsys.py"]) self.start_import_stop(cov1, "mymain") # some statements were marked executed in colorsys.py @@ -147,7 +147,7 @@ class ApiTest(CoverageTest): self.assertEqual(statements, missing) def test_exclude_list(self): - cov = coverage.coverage() + cov = coverage.Coverage() cov.clear_exclude() self.assertEqual(cov.get_exclude_list(), []) cov.exclude("foo") @@ -159,7 +159,7 @@ class ApiTest(CoverageTest): self.assertEqual(cov.get_exclude_list(), []) def test_exclude_partial_list(self): - cov = coverage.coverage() + cov = coverage.Coverage() cov.clear_exclude(which='partial') self.assertEqual(cov.get_exclude_list(which='partial'), []) cov.exclude("foo", which='partial') @@ -173,7 +173,7 @@ class ApiTest(CoverageTest): self.assertEqual(cov.get_exclude_list(which='partial'), []) def test_exclude_and_partial_are_separate_lists(self): - cov = coverage.coverage() + cov = coverage.Coverage() cov.clear_exclude(which='partial') cov.clear_exclude(which='exclude') cov.exclude("foo", which='partial') @@ -200,7 +200,7 @@ class ApiTest(CoverageTest): """) self.assertFiles(["datatest1.py"]) - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "datatest1") cov.save() self.assertFiles(["datatest1.py", ".coverage"]) @@ -212,7 +212,7 @@ class ApiTest(CoverageTest): """) self.assertFiles(["datatest2.py"]) - cov = coverage.coverage(data_file="cov.data") + cov = coverage.Coverage(data_file="cov.data") self.start_import_stop(cov, "datatest2") cov.save() self.assertFiles(["datatest2.py", "cov.data"]) @@ -224,7 +224,7 @@ class ApiTest(CoverageTest): """) self.assertFiles(["datatest3.py"]) - cov = coverage.coverage(data_file="cov.data", data_suffix="14") + cov = coverage.Coverage(data_file="cov.data", data_suffix="14") self.start_import_stop(cov, "datatest3") cov.save() self.assertFiles(["datatest3.py", "cov.data.14"]) @@ -240,14 +240,14 @@ class ApiTest(CoverageTest): """) self.assertFiles(["datatest4.py", ".coveragerc"]) - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "datatest4") cov.save() self.assertFiles(["datatest4.py", ".coveragerc", "mydata.dat"]) def test_empty_reporting(self): # empty summary reports raise exception, just like the xml report - cov = coverage.coverage() + cov = coverage.Coverage() cov.erase() self.assertRaises(CoverageException, cov.report) @@ -259,7 +259,7 @@ class ApiTest(CoverageTest): code2 = 1 code2 = 2 """) - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "code1") cov.save() self.start_import_stop(cov, "code2") @@ -280,7 +280,7 @@ class ApiTest(CoverageTest): code2 = 1 code2 = 2 """) - cov = coverage.coverage() + cov = coverage.Coverage() cov.start() self.import_local_file("code1") cov.save() @@ -374,10 +374,10 @@ class SourceOmitIncludeTest(OmitIncludeTestsMixin, CoverageTest): def coverage_usepkgs(self, **kwargs): """Run coverage on usepkgs and return the line summary. - Arguments are passed to the `coverage.coverage` constructor. + Arguments are passed to the `coverage.Coverage` constructor. """ - cov = coverage.coverage(**kwargs) + cov = coverage.Coverage(**kwargs) cov.start() import usepkgs # pragma: nested # pylint: disable=import-error,unused-variable cov.stop() # pragma: nested @@ -416,7 +416,7 @@ class ReportIncludeOmitTest(OmitIncludeTestsMixin, CoverageTest): def coverage_usepkgs(self, **kwargs): """Try coverage.report().""" - cov = coverage.coverage() + cov = coverage.Coverage() cov.start() import usepkgs # pragma: nested # pylint: disable=import-error,unused-variable cov.stop() # pragma: nested @@ -435,7 +435,7 @@ class XmlIncludeOmitTest(OmitIncludeTestsMixin, CoverageTest): def coverage_usepkgs(self, **kwargs): """Try coverage.xml_report().""" - cov = coverage.coverage() + cov = coverage.Coverage() cov.start() import usepkgs # pragma: nested # pylint: disable=import-error,unused-variable cov.stop() # pragma: nested @@ -446,7 +446,7 @@ class XmlIncludeOmitTest(OmitIncludeTestsMixin, CoverageTest): class AnalysisTest(CoverageTest): """Test the numerical analysis of results.""" def test_many_missing_branches(self): - cov = coverage.coverage(branch=True) + cov = coverage.Coverage(branch=True) self.make_file("missing.py", """\ def fun1(x): @@ -484,7 +484,7 @@ class PluginTest(CoverageTest): """ def pretend_to_be_nose_with_cover(self, erase): """This is what the nose --with-cover plugin does.""" - cov = coverage.coverage() + cov = coverage.Coverage() self.make_file("no_biggie.py", """\ a = 1 diff --git a/tests/test_collector.py b/tests/test_collector.py index 3e254f3e..bd963415 100644 --- a/tests/test_collector.py +++ b/tests/test_collector.py @@ -38,7 +38,7 @@ class CollectorTest(CoverageTest): # Trace one file, but not the other. CheckUniqueFilenames will assert # that _should_trace hasn't been called twice for the same file. - cov = coverage.coverage(include=["f1.py"]) + cov = coverage.Coverage(include=["f1.py"]) should_trace_hook = CheckUniqueFilenames.hook(cov, '_should_trace') # Import the Python file, executing it. diff --git a/tests/test_config.py b/tests/test_config.py index 6873e85d..9d3c95dc 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -18,14 +18,14 @@ class ConfigTest(CoverageTest): def test_default_config(self): # Just constructing a coverage() object gets the right defaults. - cov = coverage.coverage() + cov = coverage.Coverage() self.assertFalse(cov.config.timid) self.assertFalse(cov.config.branch) self.assertEqual(cov.config.data_file, ".coverage") def test_arguments(self): # Arguments to the constructor are applied to the configuration. - cov = coverage.coverage(timid=True, data_file="fooey.dat") + cov = coverage.Coverage(timid=True, data_file="fooey.dat") self.assertTrue(cov.config.timid) self.assertFalse(cov.config.branch) self.assertEqual(cov.config.data_file, "fooey.dat") @@ -38,7 +38,7 @@ class ConfigTest(CoverageTest): timid = True data_file = .hello_kitty.data """) - cov = coverage.coverage() + cov = coverage.Coverage() self.assertTrue(cov.config.timid) self.assertFalse(cov.config.branch) self.assertEqual(cov.config.data_file, ".hello_kitty.data") @@ -51,7 +51,7 @@ class ConfigTest(CoverageTest): ; I wouldn't really use this as a data file... data_file = delete.me """) - cov = coverage.coverage(config_file="my_cov.ini") + cov = coverage.Coverage(config_file="my_cov.ini") self.assertTrue(cov.config.timid) self.assertFalse(cov.config.branch) self.assertEqual(cov.config.data_file, "delete.me") @@ -63,7 +63,7 @@ class ConfigTest(CoverageTest): timid = True data_file = delete.me """) - cov = coverage.coverage(config_file=False) + cov = coverage.Coverage(config_file=False) self.assertFalse(cov.config.timid) self.assertFalse(cov.config.branch) self.assertEqual(cov.config.data_file, ".coverage") @@ -75,7 +75,7 @@ class ConfigTest(CoverageTest): timid = True data_file = weirdo.file """) - cov = coverage.coverage(timid=False, data_file=".mycov") + cov = coverage.Coverage(timid=False, data_file=".mycov") self.assertFalse(cov.config.timid) self.assertFalse(cov.config.branch) self.assertEqual(cov.config.data_file, ".mycov") @@ -88,10 +88,10 @@ class ConfigTest(CoverageTest): data_file = weirdo.file """) self.set_environ("COVERAGE_FILE", "fromenv.dat") - cov = coverage.coverage() + cov = coverage.Coverage() self.assertEqual(cov.config.data_file, "fromenv.dat") # But the constructor arguments override the environment variable. - cov = coverage.coverage(data_file="fromarg.dat") + cov = coverage.Coverage(data_file="fromarg.dat") self.assertEqual(cov.config.data_file, "fromarg.dat") def test_parse_errors(self): @@ -116,7 +116,7 @@ class ConfigTest(CoverageTest): print("Trying %r" % bad_config) self.make_file(".coveragerc", bad_config) with self.assertRaisesRegex(CoverageException, msg): - coverage.coverage() + coverage.Coverage() def test_environment_vars_in_config(self): # Config files can have $envvars in them. @@ -135,7 +135,7 @@ class ConfigTest(CoverageTest): self.set_environ("DATA_FILE", "hello-world") self.set_environ("THING", "ZZZ") self.set_environ("OKAY", "yes") - cov = coverage.coverage() + cov = coverage.Coverage() self.assertEqual(cov.config.data_file, "hello-world.fooey") self.assertEqual(cov.config.branch, True) self.assertEqual( @@ -145,7 +145,7 @@ class ConfigTest(CoverageTest): def test_tweaks_after_constructor(self): # Arguments to the constructor are applied to the configuration. - cov = coverage.coverage(timid=True, data_file="fooey.dat") + cov = coverage.Coverage(timid=True, data_file="fooey.dat") cov.config["run:timid"] = False self.assertFalse(cov.config.timid) @@ -158,7 +158,7 @@ class ConfigTest(CoverageTest): def test_tweak_error_checking(self): # Trying to set an unknown config value raises an error. - cov = coverage.coverage() + cov = coverage.Coverage() with self.assertRaises(CoverageException): cov.config["run:xyzzy"] = 12 with self.assertRaises(CoverageException): @@ -170,7 +170,7 @@ class ConfigTest(CoverageTest): def test_tweak_plugin_options(self): # Plugin options have a more flexible syntax. - cov = coverage.coverage() + cov = coverage.Coverage() cov.config["run:plugins"] = ["fooey.plugin", "xyzzy.coverage.plugin"] cov.config["fooey.plugin:xyzzy"] = 17 cov.config["xyzzy.coverage.plugin:plugh"] = ["a", "b"] @@ -332,7 +332,7 @@ class ConfigFileTest(CoverageTest): def test_config_file_settings(self): self.make_file(".coveragerc", self.LOTSA_SETTINGS.format(section="")) - cov = coverage.coverage() + cov = coverage.Coverage() self.assert_config_settings_are_correct(cov) def test_config_file_settings_in_setupcfg(self): @@ -340,7 +340,7 @@ class ConfigFileTest(CoverageTest): # "coverage:" nested = self.LOTSA_SETTINGS.format(section="coverage:") self.make_file("setup.cfg", nested + "\n" + self.SETUP_CFG) - cov = coverage.coverage() + cov = coverage.Coverage() self.assert_config_settings_are_correct(cov) def test_config_file_settings_in_setupcfg_if_coveragerc_specified(self): @@ -349,7 +349,7 @@ class ConfigFileTest(CoverageTest): # .coveragerc file. nested = self.LOTSA_SETTINGS.format(section="coverage:") self.make_file("setup.cfg", nested + "\n" + self.SETUP_CFG) - cov = coverage.coverage(config_file=".coveragerc") + cov = coverage.Coverage(config_file=".coveragerc") self.assert_config_settings_are_correct(cov) def test_setupcfg_only_if_not_coveragerc(self): @@ -362,7 +362,7 @@ class ConfigFileTest(CoverageTest): omit = bar branch = true """) - cov = coverage.coverage() + cov = coverage.Coverage() self.assertEqual(cov.config.include, ["foo"]) self.assertEqual(cov.config.omit, None) self.assertEqual(cov.config.branch, False) @@ -373,7 +373,7 @@ class ConfigFileTest(CoverageTest): omit = bar branch = true """) - cov = coverage.coverage() + cov = coverage.Coverage() self.assertEqual(cov.config.omit, None) self.assertEqual(cov.config.branch, False) @@ -382,7 +382,7 @@ class ConfigFileTest(CoverageTest): [html] title = tabblo & «ταБЬℓσ» # numbers """) - cov = coverage.coverage() + cov = coverage.Coverage() self.assertEqual(cov.config.html_title, "tabblo & «ταБЬℓσ» # numbers") @@ -396,10 +396,10 @@ class ConfigFileTest(CoverageTest): for bad_file in bad_files: msg = "Couldn't read %r as a config file" % bad_file with self.assertRaisesRegex(CoverageException, msg): - coverage.coverage(config_file=bad_file) + coverage.Coverage(config_file=bad_file) def test_nocoveragerc_file_when_specified(self): - cov = coverage.coverage(config_file=".coveragerc") + cov = coverage.Coverage(config_file=".coveragerc") self.assertFalse(cov.config.timid) self.assertFalse(cov.config.branch) self.assertEqual(cov.config.data_file, ".coverage") diff --git a/tests/test_coverage.py b/tests/test_coverage.py index 2226c009..e2f0a614 100644 --- a/tests/test_coverage.py +++ b/tests/test_coverage.py @@ -1665,8 +1665,11 @@ class ModuleTest(CoverageTest): def test_not_singleton(self): # You *can* create another coverage object. - coverage.coverage() - coverage.coverage() + coverage.Coverage() + coverage.Coverage() + + def test_old_name_and_new_name(self): + self.assertIs(coverage.coverage, coverage.Coverage) class ReportingTest(CoverageTest): diff --git a/tests/test_debug.py b/tests/test_debug.py index 90218886..4d9e9271 100644 --- a/tests/test_debug.py +++ b/tests/test_debug.py @@ -64,7 +64,7 @@ class DebugTraceTest(CoverageTest): """) debug_out = StringIO() - cov = coverage.coverage(debug=debug) + 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 f66dec64..d9ecb678 100644 --- a/tests/test_html.py +++ b/tests/test_html.py @@ -38,7 +38,7 @@ class HtmlTestHelpers(CoverageTest): def run_coverage(self, covargs=None, htmlargs=None): """Run coverage.py on main_file.py, and create an HTML report.""" self.clean_local_file_imports() - cov = coverage.coverage(**(covargs or {})) + cov = coverage.Coverage(**(covargs or {})) self.start_import_stop(cov, "main_file") cov.html_report(**(htmlargs or {})) @@ -243,7 +243,7 @@ class HtmlWithUnparsableFilesTest(HtmlTestHelpers, CoverageTest): def test_dotpy_not_python(self): self.make_file("innocuous.py", "a = 1") - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "innocuous") self.make_file("innocuous.py", "<h1>This isn't python!</h1>") msg = "Couldn't parse '.*innocuous.py' as Python source: .* at line 1" @@ -252,7 +252,7 @@ class HtmlWithUnparsableFilesTest(HtmlTestHelpers, CoverageTest): def test_dotpy_not_python_ignored(self): self.make_file("innocuous.py", "a = 2") - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "innocuous") self.make_file("innocuous.py", "<h1>This isn't python!</h1>") cov.html_report(ignore_errors=True) @@ -279,7 +279,7 @@ class HtmlWithUnparsableFilesTest(HtmlTestHelpers, CoverageTest): source = "exec(compile('','','exec'), {'__file__': 'liar.html'})" self.make_file("liar.py", source) self.make_file("liar.html", "{# Whoops, not python code #}") - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "liar") cov.html_report() self.assert_exists("htmlcov/index.html") @@ -292,7 +292,7 @@ class HtmlWithUnparsableFilesTest(HtmlTestHelpers, CoverageTest): self.make_file("liar.py", source) # Tokenize will raise an IndentationError if it can't dedent. self.make_file("liar.html", "0\n 2\n 1\n") - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "liar") cov.html_report() self.assert_exists("htmlcov/index.html") @@ -308,7 +308,7 @@ class HtmlWithUnparsableFilesTest(HtmlTestHelpers, CoverageTest): # coding: utf8 a = 1 # Isn't this great?! """) - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "main") # Create the undecodable version of the file. make_file is too helpful, @@ -329,7 +329,7 @@ class HtmlWithUnparsableFilesTest(HtmlTestHelpers, CoverageTest): def test_formfeeds(self): # https://bitbucket.org/ned/coveragepy/issue/360/html-reports-get-confused-by-l-in-the-code self.make_file("formfeed.py", "line_one = 1\n\f\nline_two = 2\n") - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "formfeed") cov.html_report() @@ -345,7 +345,7 @@ class HtmlTest(HtmlTestHelpers, CoverageTest): self.make_file("thefile.py", "import sub.another\n") self.make_file("sub/__init__.py", "") self.make_file("sub/another.py", "print('another')\n") - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, 'thefile') os.remove("sub/another.py") @@ -409,7 +409,7 @@ class HtmlStaticFileTest(CoverageTest): coverage.html.STATIC_PATH.insert(0, "static_here") self.make_file("main.py", "print(17)") - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "main") cov.html_report() @@ -430,7 +430,7 @@ class HtmlStaticFileTest(CoverageTest): coverage.html.STATIC_PATH.insert(0, "static_here") self.make_file("main.py", "print(17)") - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "main") cov.html_report() @@ -445,7 +445,7 @@ class HtmlStaticFileTest(CoverageTest): coverage.html.STATIC_PATH = ["/xyzzy"] self.make_file("main.py", "print(17)") - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "main") msg = "Couldn't find static file u?'.*'" with self.assertRaisesRegex(CoverageException, msg): diff --git a/tests/test_oddball.py b/tests/test_oddball.py index 90a28475..05c724b6 100644 --- a/tests/test_oddball.py +++ b/tests/test_oddball.py @@ -110,7 +110,7 @@ class RecursionTest(CoverageTest): i = 11 """) - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "recur") pytrace = (cov.collector.tracer_name() == "PyTracer") @@ -212,7 +212,7 @@ class PyexpatTest(CoverageTest): self.make_file("outer.py", "\n"*100 + "import trydom\na = 102\n") - cov = coverage.coverage() + cov = coverage.Coverage() cov.erase() # Import the Python file, executing it. @@ -313,7 +313,7 @@ class ExceptionTest(CoverageTest): callnames = callnames.split() calls = [getattr(sys.modules[cn], cn) for cn in callnames] - cov = coverage.coverage() + cov = coverage.Coverage() cov.start() # Call our list of functions: invoke the first, with the rest as # an argument. @@ -424,7 +424,7 @@ class ExecTest(CoverageTest): print("done") # line 35 """) - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "main") _, statements, missing, _ = cov.analysis("main.py") diff --git a/tests/test_summary.py b/tests/test_summary.py index eb31d824..850f4dfd 100644 --- a/tests/test_summary.py +++ b/tests/test_summary.py @@ -408,7 +408,7 @@ class SummaryTest(CoverageTest): self.make_file("main.py", """\ print("y") """) - cov = coverage.coverage(branch=True, source=["."]) + cov = coverage.Coverage(branch=True, source=["."]) cov.start() import main # pragma: nested # pylint: disable=import-error,unused-variable cov.stop() # pragma: nested @@ -417,7 +417,7 @@ class SummaryTest(CoverageTest): def run_TheCode_and_report_it(self): """A helper for the next few tests.""" - cov = coverage.coverage() + cov = coverage.Coverage() cov.start() import TheCode # pragma: nested # pylint: disable=import-error,unused-variable cov.stop() # pragma: nested @@ -452,7 +452,7 @@ class SummaryTest(CoverageTest): self.make_file("mod.pyw", """\ print("In mod.pyw") """) - cov = coverage.coverage() + cov = coverage.Coverage() cov.start() import start # pragma: nested # pylint: disable=import-error,unused-variable cov.stop() # pragma: nested @@ -472,7 +472,7 @@ class SummaryTest(CoverageTest): py_compile.compile("mod.py") # Run the program. - cov = coverage.coverage() + cov = coverage.Coverage() cov.start() import main # pragma: nested # pylint: disable=import-error,unused-variable cov.stop() # pragma: nested @@ -502,7 +502,7 @@ class SummaryTest(CoverageTest): os.rename(pycs[0], "mod.pyc") # Run the program. - cov = coverage.coverage() + cov = coverage.Coverage() cov.start() import main # pragma: nested # pylint: disable=import-error,unused-variable cov.stop() # pragma: nested @@ -530,7 +530,7 @@ class SummaryTest2(CoverageTest): def test_empty_files(self): # Shows that empty files like __init__.py are listed as having zero # statements, not one statement. - cov = coverage.coverage() + cov = coverage.Coverage() cov.start() import usepkgs # pragma: nested # pylint: disable=import-error,unused-variable cov.stop() # pragma: nested @@ -559,7 +559,7 @@ class ReportingReturnValueTest(CoverageTest): g = 7 """) - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "doit") return cov diff --git a/tests/test_xml.py b/tests/test_xml.py index af4ecee7..dbf09279 100644 --- a/tests/test_xml.py +++ b/tests/test_xml.py @@ -24,7 +24,7 @@ class XmlTestHelpers(CoverageTest): self.make_file("sub/__init__.py") self.make_file("sub/doit.py", "print('doit!')") self.make_file("main.py", "import sub.doit") - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "main") return cov @@ -91,7 +91,7 @@ class XmlReportTest(XmlTestHelpers, CoverageTest): # Written while investigating a bug, might as well keep it. # https://bitbucket.org/ned/coveragepy/issue/208 self.make_file("innocuous.py", "a = 4") - cov = coverage.coverage() + cov = coverage.Coverage() self.start_import_stop(cov, "innocuous") os.remove("innocuous.py") cov.xml_report(ignore_errors=True) @@ -123,7 +123,7 @@ class XmlReportTest(XmlTestHelpers, CoverageTest): # Used to raise a zero division error: # https://bitbucket.org/ned/coveragepy/issue/250 self.make_file("empty.py", "") - cov = coverage.coverage() + cov = coverage.Coverage() empty = self.start_import_stop(cov, "empty") cov.xml_report([empty], outfile="-") xml = self.stdout() @@ -163,7 +163,7 @@ class XmlPackageStructureTest(XmlTestHelpers, CoverageTest): self.make_file("main.py", """\ from d0.d0 import f0 """) - cov = coverage.coverage(source=".") + cov = coverage.Coverage(source=".") self.start_import_stop(cov, "main") self.assert_package_and_class_tags(cov, """\ <package name="."> @@ -181,7 +181,7 @@ class XmlPackageStructureTest(XmlTestHelpers, CoverageTest): self.make_file("main.py", """\ from d0.d0 import f0 """) - cov = coverage.coverage(source=".") + cov = coverage.Coverage(source=".") self.start_import_stop(cov, "main") cov.config["xml:package_depth"] = 1 |