Move the test runner plugins into their own sub-package.

6 files changed, 7 insertions, 4 deletions

diff --git a/TODO.txt b/TODO.txt
index d7aefdd..307f7d5 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,5 +1,8 @@
 Coverage TODO
 
+* plugin work
+    - add --include.
+
 * 3.3
 
 - Config file
diff --git a/coverage/runners/__init__.py b/coverage/runners/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/coverage/runners/__init__.py
diff --git a/coverage/noseplugin.py b/coverage/runners/noseplugin.py
index 9e254ea..20e7373 100644
--- a/coverage/noseplugin.py
+++ b/coverage/runners/noseplugin.py
@@ -1,7 +1,7 @@
 import logging
 from nose.plugins import Plugin
 
-from coverage.testplugin import CoverageTestWrapper, options as coverage_opts
+from coverage.runners.pytestplugin import CoverageTestWrapper, options as coverage_opts
 
 
 log = logging.getLogger(__name__)
diff --git a/coverage/testplugin.py b/coverage/runners/pytestplugin.py
index 5783300..5783300 100644
--- a/coverage/testplugin.py
+++ b/coverage/runners/pytestplugin.py
diff --git a/setup.py b/setup.py
index e8aa334..399aacc 100644
--- a/setup.py
+++ b/setup.py
@@ -82,10 +82,10 @@ setup_args = dict(
             'coverage = coverage:main',
             ],
         'pytest11': [
-            'coverage = coverage.testplugin',
+            'coverage = coverage.runners.pytestplugin',
             ],
         'nose.plugins.0.10': [
-            'coverage = coverage.noseplugin:Coverage',
+            'coverage = coverage.runners.noseplugin:Coverage',
             ],
         },
         
diff --git a/test/test_testplugin.py b/test/test_testplugin.py
index 87e2e4b..98459f5 100644
--- a/test/test_testplugin.py
+++ b/test/test_testplugin.py
@@ -1,7 +1,7 @@
 import py
 import unittest
 from nose.plugins import PluginTester
-from coverage.noseplugin import Coverage
+from coverage.runners.noseplugin import Coverage
 
 class TestCoverage(PluginTester, unittest.TestCase):
     activate = '--with-coverage' # enables the plugin