diff options
| -rw-r--r-- | coverage/__init__.py | 6 | ||||
| -rw-r--r-- | pylintrc | 3 | ||||
| -rw-r--r-- | setup.py | 8 | ||||
| -rw-r--r-- | tests/conftest.py | 3 |
4 files changed, 10 insertions, 10 deletions
diff --git a/coverage/__init__.py b/coverage/__init__.py index 5edb7524..12644a5c 100644 --- a/coverage/__init__.py +++ b/coverage/__init__.py @@ -8,13 +8,14 @@ https://nedbatchelder.com/code/coverage """ -from coverage.version import __version__, __url__, version_info +import sys from coverage.control import Coverage, process_startup from coverage.data import CoverageData from coverage.misc import CoverageException from coverage.plugin import CoveragePlugin, FileTracer, FileReporter from coverage.pytracer import PyTracer +from coverage.version import __version__, __url__, version_info # Backward compatibility. coverage = Coverage @@ -22,13 +23,12 @@ coverage = Coverage # On Windows, we encode and decode deep enough that something goes wrong and # the encodings.utf_8 module is loaded and then unloaded, I don't know why. # Adding a reference here prevents it from being unloaded. Yuk. -import encodings.utf_8 +import encodings.utf_8 # pylint: disable=wrong-import-position, wrong-import-order # Because of the "from coverage.control import fooey" lines at the top of the # file, there's an entry for coverage.coverage in sys.modules, mapped to None. # This makes some inspection tools (like pydoc) unable to find the class # coverage.coverage. So remove that entry. -import sys try: del sys.modules['coverage.coverage'] except KeyError: @@ -74,9 +74,6 @@ disable= too-many-ancestors, # Formatting stuff superfluous-parens,bad-continuation, -# I'm fine deciding my own import order, - wrong-import-position, - wrong-import-order, # Messages that are noisy for now, eventually maybe we'll turn them on: invalid-name, protected-access, @@ -9,10 +9,12 @@ import os import sys +# Setuptools has to be imported before distutils, or things break. from setuptools import setup -from distutils.core import Extension # pylint: disable=no-name-in-module, import-error -from distutils.command.build_ext import build_ext # pylint: disable=no-name-in-module, import-error -from distutils import errors # pylint: disable=no-name-in-module +from distutils.core import Extension # pylint: disable=no-name-in-module, import-error, wrong-import-order +from distutils.command.build_ext import build_ext # pylint: disable=no-name-in-module, import-error, wrong-import-order +from distutils import errors # pylint: disable=no-name-in-module, wrong-import-order + # Get or massage our metadata. We exec coverage/version.py so we can avoid # importing the product code into setup.py. diff --git a/tests/conftest.py b/tests/conftest.py index aeccec88..e9802517 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -7,9 +7,10 @@ Pytest auto configuration. This module is run automatically by pytest, to define and enable fixtures. """ -import pytest import warnings +import pytest + from coverage import env |