diff options
| -rw-r--r-- | coverage/__init__.py | 1 | ||||
| -rw-r--r-- | setup.py | 6 | ||||
| -rw-r--r-- | tests/coveragetest.py | 3 | ||||
| -rw-r--r-- | tests/test_cmdline.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/coverage/__init__.py b/coverage/__init__.py index 4b6b46a..3c72655 100644 --- a/coverage/__init__.py +++ b/coverage/__init__.py @@ -9,7 +9,6 @@ from coverage.version import __version__, __url__ 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 @@ -75,9 +75,9 @@ classifier_list.append("Development Status :: " + devstat) # Install a script as "coverage", and as "coverage[23]", and as # "coverage-2.7" (or whatever). scripts = [ - 'coverage = coverage:main', - 'coverage%d = coverage:main' % sys.version_info[:1], - 'coverage-%d.%d = coverage:main' % sys.version_info[:2], + 'coverage = coverage.cmdline:main', + 'coverage%d = coverage.cmdline:main' % sys.version_info[:1], + 'coverage-%d.%d = coverage.cmdline:main' % sys.version_info[:2], ] # Create the keyword arguments for setup() diff --git a/tests/coveragetest.py b/tests/coveragetest.py index a853541..2c92353 100644 --- a/tests/coveragetest.py +++ b/tests/coveragetest.py @@ -12,6 +12,7 @@ import sys import coverage from coverage.backunittest import TestCase from coverage.backward import StringIO, import_local_file, string_class +from coverage.cmdline import CoverageScript from coverage.debug import _TEST_NAME_FILE, DebugControl from coverage.test_helpers import ( EnvironmentAwareMixin, StdStreamCapturingMixin, TempDirMixin, @@ -299,7 +300,7 @@ class CoverageTest( Returns None. """ - script = coverage.CoverageScript(_covpkg=_covpkg) + script = CoverageScript(_covpkg=_covpkg) ret_actual = script.command_line(shlex.split(args)) self.assertEqual(ret_actual, ret) diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py index 70bcdb4..79a8339 100644 --- a/tests/test_cmdline.py +++ b/tests/test_cmdline.py @@ -63,7 +63,7 @@ class BaseCmdLineTest(CoverageTest): """ m = self.model_object() - ret = coverage.CoverageScript( + ret = coverage.cmdline.CoverageScript( _covpkg=m, _run_python_file=m.run_python_file, _run_python_module=m.run_python_module, _help_fn=m.help_fn ).command_line(shlex.split(args)) |