refactor: move exceptions to their own module

coverage/__init__.py

@@ -14,7 +14,7 @@
 
 from coverage.control import Coverage, process_startup
 from coverage.data import CoverageData
-from coverage.misc import CoverageException
+from coverage.exceptions import CoverageException
 from coverage.plugin import CoveragePlugin, FileTracer, FileReporter
 from coverage.pytracer import PyTracer
 

coverage/cmdline.py

@@ -18,8 +18,8 @@
 from coverage.collector import CTracer
 from coverage.data import line_counts
 from coverage.debug import info_formatter, info_header, short_stack
+from coverage.exceptions import BaseCoverageException, ExceptionDuringRun, NoSource
 from coverage.execfile import PyRunner
-from coverage.misc import BaseCoverageException, ExceptionDuringRun, NoSource
 from coverage.results import should_fail_under
 
 

coverage/collector.py

@@ -9,7 +9,8 @@
 from coverage import env
 from coverage.debug import short_stack
 from coverage.disposition import FileDisposition
-from coverage.misc import CoverageException, isolate_module
+from coverage.exceptions import CoverageException
+from coverage.misc import isolate_module
 from coverage.pytracer import PyTracer
 
 os = isolate_module(os)

coverage/config.py

@@ -10,8 +10,8 @@
 import os.path
 import re
 
-from coverage.misc import contract, CoverageException, isolate_module
-from coverage.misc import substitute_variables
+from coverage.exceptions import CoverageException
+from coverage.misc import contract, isolate_module, substitute_variables
 
 from coverage.tomlconfig import TomlConfigParser, TomlDecodeError
 

coverage/control.py

@@ -20,11 +20,12 @@
 from coverage.data import CoverageData, combine_parallel_data
 from coverage.debug import DebugControl, short_stack, write_formatted_info
 from coverage.disposition import disposition_debug_msg
+from coverage.exceptions import CoverageException
 from coverage.files import PathAliases, abs_file, relative_filename, set_relative_directory
 from coverage.html import HtmlReporter
 from coverage.inorout import InOrOut
 from coverage.jsonreport import JsonReporter
-from coverage.misc import CoverageException, bool_or_none, join_regex
+from coverage.misc import bool_or_none, join_regex
 from coverage.misc import DefaultValue, ensure_dir_for_file, isolate_module
 from coverage.plugin import FileReporter
 from coverage.plugin_support import Plugins

coverage/data.py

@@ -13,7 +13,8 @@
 import glob
 import os.path
 
-from coverage.misc import CoverageException, file_be_gone
+from coverage.exceptions import CoverageException
+from coverage.misc import file_be_gone
 from coverage.sqldata import CoverageData
 
 

coverage/exceptions.py

@@ -0,0 +1,48 @@
+# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
+# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
+
+"""Exceptions coverage.py can raise."""
+
+
+class BaseCoverageException(Exception):
+    """The base of all Coverage exceptions."""
+    pass
+
+
+class CoverageException(BaseCoverageException):
+    """An exception raised by a coverage.py function."""
+    pass
+
+
+class NoSource(CoverageException):
+    """We couldn't find the source for a module."""
+    pass
+
+
+class NoCode(NoSource):
+    """We couldn't find any code at all."""
+    pass
+
+
+class NotPython(CoverageException):
+    """A source file turned out not to be parsable Python."""
+    pass
+
+
+class ExceptionDuringRun(CoverageException):
+    """An exception happened while running customer code.
+
+    Construct it with three arguments, the values from `sys.exc_info`.
+
+    """
+    pass
+
+
+class StopEverything(BaseCoverageException):
+    """An exception that means everything should stop.
+
+    The CoverageTest class converts these to SkipTest, so that when running
+    tests, raising this exception will automatically skip the test.
+
+    """
+    pass

coverage/execfile.py

@@ -13,8 +13,9 @@
 import types
 
 from coverage import env
+from coverage.exceptions import CoverageException, ExceptionDuringRun, NoCode, NoSource
 from coverage.files import canonical_filename, python_reported_file
-from coverage.misc import CoverageException, ExceptionDuringRun, NoCode, NoSource, isolate_module
+from coverage.misc import isolate_module
 from coverage.phystokens import compile_unicode
 from coverage.python import get_python_source
 

coverage/files.py

@@ -13,7 +13,8 @@
 import sys
 
 from coverage import env
-from coverage.misc import contract, CoverageException, join_regex, isolate_module
+from coverage.exceptions import CoverageException
+from coverage.misc import contract, join_regex, isolate_module
 
 
 os = isolate_module(os)

coverage/html.py

@@ -12,9 +12,9 @@
 
 import coverage
 from coverage.data import add_data_to_hash
+from coverage.exceptions import CoverageException
 from coverage.files import flat_rootname
-from coverage.misc import CoverageException, ensure_dir, file_be_gone, Hasher, isolate_module
-from coverage.misc import format_local_datetime
+from coverage.misc import ensure_dir, file_be_gone, Hasher, isolate_module, format_local_datetime
 from coverage.report import get_analysis_to_report
 from coverage.results import Numbers
 from coverage.templite import Templite

coverage/inorout.py

@@ -15,9 +15,9 @@
 
 from coverage import env
 from coverage.disposition import FileDisposition, disposition_init
+from coverage.exceptions import CoverageException
 from coverage.files import TreeMatcher, FnmatchMatcher, ModuleMatcher
 from coverage.files import prep_patterns, find_python_files, canonical_filename
-from coverage.misc import CoverageException
 from coverage.python import source_for_file, source_for_morf
 
 

coverage/misc.py

@@ -17,6 +17,7 @@
 import types
 
 from coverage import env
+from coverage.exceptions import CoverageException
 
 ISOLATED_MODULES = {}
 
@@ -338,47 +339,3 @@ def import_local_file(modname, modfile=None):
     spec.loader.exec_module(mod)
 
     return mod
-
-
-class BaseCoverageException(Exception):
-    """The base of all Coverage exceptions."""
-    pass
-
-
-class CoverageException(BaseCoverageException):
-    """An exception raised by a coverage.py function."""
-    pass
-
-
-class NoSource(CoverageException):
-    """We couldn't find the source for a module."""
-    pass
-
-
-class NoCode(NoSource):
-    """We couldn't find any code at all."""
-    pass
-
-
-class NotPython(CoverageException):
-    """A source file turned out not to be parsable Python."""
-    pass
-
-
-class ExceptionDuringRun(CoverageException):
-    """An exception happened while running customer code.
-
-    Construct it with three arguments, the values from `sys.exc_info`.
-
-    """
-    pass
-
-
-class StopEverything(BaseCoverageException):
-    """An exception that means everything should stop.
-
-    The CoverageTest class converts these to SkipTest, so that when running
-    tests, raising this exception will automatically skip the test.
-
-    """
-    pass

coverage/parser.py

@@ -13,8 +13,8 @@
 from coverage import env
 from coverage.bytecode import code_objects
 from coverage.debug import short_stack
+from coverage.exceptions import NoSource, NotPython, StopEverything
 from coverage.misc import contract, join_regex, new_contract, nice_pair, one_of
-from coverage.misc import NoSource, NotPython, StopEverything
 from coverage.phystokens import compile_unicode, generate_tokens, neuter_encoding_declaration
 
 

coverage/plugin_support.py

@@ -7,7 +7,8 @@
 import os.path
 import sys
 
-from coverage.misc import CoverageException, isolate_module
+from coverage.exceptions import CoverageException
+from coverage.misc import isolate_module
 from coverage.plugin import CoveragePlugin, FileTracer, FileReporter
 
 os = isolate_module(os)

coverage/python.py

@@ -8,8 +8,8 @@
 import zipimport
 
 from coverage import env, files
+from coverage.exceptions import CoverageException, NoSource
 from coverage.misc import contract, expensive, isolate_module, join_regex
-from coverage.misc import CoverageException, NoSource
 from coverage.parser import PythonParser
 from coverage.phystokens import source_token_lines, source_encoding
 from coverage.plugin import FileReporter

coverage/report.py

@@ -4,8 +4,9 @@
 """Reporter foundation for coverage.py."""
 import sys
 
+from coverage.exceptions import CoverageException, NoSource, NotPython
 from coverage.files import prep_patterns, FnmatchMatcher
-from coverage.misc import CoverageException, NoSource, NotPython, ensure_dir_for_file, file_be_gone
+from coverage.misc import ensure_dir_for_file, file_be_gone
 
 
 def render_report(output_path, reporter, morfs):

coverage/results.py

@@ -6,7 +6,8 @@
 import collections
 
 from coverage.debug import SimpleReprMixin
-from coverage.misc import contract, CoverageException, nice_pair
+from coverage.exceptions import CoverageException
+from coverage.misc import contract, nice_pair
 
 
 class Analysis:

coverage/sqldata.py

@@ -18,8 +18,9 @@
 import zlib
 
 from coverage.debug import NoDebugging, SimpleReprMixin, clipped_repr
+from coverage.exceptions import CoverageException
 from coverage.files import PathAliases
-from coverage.misc import CoverageException, contract, file_be_gone, filename_suffix, isolate_module
+from coverage.misc import contract, file_be_gone, filename_suffix, isolate_module
 from coverage.numbits import numbits_to_nums, numbits_union, nums_to_numbits
 from coverage.version import __version__
 

coverage/summary.py

@@ -5,9 +5,9 @@
 
 import sys
 
+from coverage.exceptions import CoverageException
 from coverage.report import get_analysis_to_report
 from coverage.results import Numbers
-from coverage.misc import CoverageException
 
 
 class SummaryReporter:

coverage/tomlconfig.py

@@ -7,7 +7,8 @@
 import os
 import re
 
-from coverage.misc import CoverageException, substitute_variables
+from coverage.exceptions import CoverageException
+from coverage.misc import substitute_variables
 
 # TOML support is an install-time extra option.
 try:

lab/parse_all.py

@@ -3,7 +3,7 @@
 import os
 import sys
 
-from coverage.misc import CoverageException
+from coverage.exceptions import CoverageException
 from coverage.parser import PythonParser
 
 for root, dirnames, filenames in os.walk(sys.argv[1]):

tests/conftest.py

@@ -14,7 +14,7 @@
 import pytest
 
 from coverage import env
-from coverage.misc import StopEverything
+from coverage.exceptions import StopEverything
 
 
 # Pytest will rewrite assertions in test modules, but not elsewhere.

tests/test_api.py

@@ -18,8 +18,9 @@
 import coverage
 from coverage import env
 from coverage.data import line_counts
+from coverage.exceptions import CoverageException
 from coverage.files import abs_file, relative_filename
-from coverage.misc import CoverageException, import_local_file
+from coverage.misc import import_local_file
 
 from tests.coveragetest import CoverageTest, TESTS_DIR, UsingModulesMixin
 from tests.helpers import assert_count_equal, change_dir, nice_file

tests/test_cmdline.py

@@ -16,7 +16,7 @@
 from coverage import env
 from coverage.config import CoverageConfig
 from coverage.data import CoverageData
-from coverage.misc import ExceptionDuringRun
+from coverage.exceptions import ExceptionDuringRun
 from coverage.version import __url__
 
 from tests.coveragetest import CoverageTest, OK, ERR, command_line

tests/test_config.py

@@ -10,7 +10,7 @@
 
 import coverage
 from coverage.config import HandyConfigParser
-from coverage.misc import CoverageException
+from coverage.exceptions import CoverageException
 
 from tests.coveragetest import CoverageTest, UsingModulesMixin
 from tests.helpers import without_module

tests/test_coverage.py

@@ -7,7 +7,7 @@
 
 import coverage
 from coverage import env
-from coverage.misc import CoverageException
+from coverage.exceptions import CoverageException
 
 from tests.coveragetest import CoverageTest
 

tests/test_data.py

@@ -16,8 +16,8 @@
 from coverage.data import CoverageData, combine_parallel_data
 from coverage.data import add_data_to_hash, line_counts
 from coverage.debug import DebugControlString
+from coverage.exceptions import CoverageException
 from coverage.files import PathAliases, canonical_filename
-from coverage.misc import CoverageException
 
 from tests.coveragetest import CoverageTest
 from tests.helpers import assert_count_equal

tests/test_execfile.py

@@ -14,9 +14,9 @@
 import pytest
 
 from coverage import env
+from coverage.exceptions import NoCode, NoSource
 from coverage.execfile import run_python_file, run_python_module
 from coverage.files import python_reported_file
-from coverage.misc import NoCode, NoSource
 
 from tests.coveragetest import CoverageTest, TESTS_DIR, UsingModulesMixin
 

tests/test_files.py

@@ -8,13 +8,13 @@
 
 import pytest
 
+from coverage import env
 from coverage import files
+from coverage.exceptions import CoverageException
 from coverage.files import (
     TreeMatcher, FnmatchMatcher, ModuleMatcher, PathAliases,
     find_python_files, abs_file, actual_path, flat_rootname, fnmatches_to_regex,
 )
-from coverage.misc import CoverageException
-from coverage import env
 
 from tests.coveragetest import CoverageTest
 

tests/test_html.py

@@ -16,9 +16,9 @@
 
 import coverage
 from coverage import env
+from coverage.exceptions import CoverageException, NotPython, NoSource
 from coverage.files import abs_file, flat_rootname
 import coverage.html
-from coverage.misc import CoverageException, NotPython, NoSource
 from coverage.report import get_analysis_to_report
 
 from tests.coveragetest import CoverageTest, TESTS_DIR