summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2014-08-22 21:30:53 -0400
committerNed Batchelder <ned@nedbatchelder.com>2014-08-22 21:30:53 -0400
commitda16957f1b15a3b4b960a11f7d6d36448630c978 (patch)
tree1b800ef1aa804602fe1c076a055fa9e1afc3c9a7
parent5c88838a8cfb53dac3d63b272ea137f7a4f09f87 (diff)
downloadpython-coveragepy-git-da16957f1b15a3b4b960a11f7d6d36448630c978.tar.gz
Make CoveragePlugin importable from coverage
-rw-r--r--coverage/__init__.py1
-rw-r--r--tests/modules/plugins/a_plugin.py2
-rw-r--r--tests/modules/plugins/another.py2
-rw-r--r--tests/test_plugins.py8
4 files changed, 7 insertions, 6 deletions
diff --git a/coverage/__init__.py b/coverage/__init__.py
index 18e3b6f4..5ae32aba 100644
--- a/coverage/__init__.py
+++ b/coverage/__init__.py
@@ -11,6 +11,7 @@ from coverage.control import Coverage, process_startup
from coverage.data import CoverageData
from coverage.cmdline import main, CoverageScript
from coverage.misc import CoverageException
+from coverage.plugin import CoveragePlugin
# Backward compatibility.
coverage = Coverage
diff --git a/tests/modules/plugins/a_plugin.py b/tests/modules/plugins/a_plugin.py
index 93ac4854..2ff84dac 100644
--- a/tests/modules/plugins/a_plugin.py
+++ b/tests/modules/plugins/a_plugin.py
@@ -1,6 +1,6 @@
"""A plugin for tests to reference."""
-from coverage.plugin import CoveragePlugin
+from coverage import CoveragePlugin
class Plugin(CoveragePlugin):
pass
diff --git a/tests/modules/plugins/another.py b/tests/modules/plugins/another.py
index 93ac4854..2ff84dac 100644
--- a/tests/modules/plugins/another.py
+++ b/tests/modules/plugins/another.py
@@ -1,6 +1,6 @@
"""A plugin for tests to reference."""
-from coverage.plugin import CoveragePlugin
+from coverage import CoveragePlugin
class Plugin(CoveragePlugin):
pass
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
index bc94b983..154f1a7d 100644
--- a/tests/test_plugins.py
+++ b/tests/test_plugins.py
@@ -28,7 +28,7 @@ class PluginUnitTest(CoverageTest):
def test_importing_and_configuring(self):
self.make_file("plugin1.py", """\
- from coverage.plugin import CoveragePlugin
+ from coverage import CoveragePlugin
class Plugin(CoveragePlugin):
def __init__(self, options):
@@ -46,7 +46,7 @@ class PluginUnitTest(CoverageTest):
def test_importing_and_configuring_more_than_one(self):
self.make_file("plugin1.py", """\
- from coverage.plugin import CoveragePlugin
+ from coverage import CoveragePlugin
class Plugin(CoveragePlugin):
def __init__(self, options):
@@ -54,7 +54,7 @@ class PluginUnitTest(CoverageTest):
self.this_is = "me"
""")
self.make_file("plugin2.py", """\
- from coverage.plugin import CoveragePlugin
+ from coverage import CoveragePlugin
class Plugin(CoveragePlugin):
pass
@@ -75,7 +75,7 @@ class PluginUnitTest(CoverageTest):
def test_ok_to_not_define_plugin(self):
self.make_file("plugin2.py", """\
- from coverage.plugin import CoveragePlugin
+ from coverage import CoveragePlugin
Nothing = 0
""")