summaryrefslogtreecommitdiff
path: root/coverage
diff options
context:
space:
mode:
Diffstat (limited to 'coverage')
-rw-r--r--coverage/backunittest.py2
-rw-r--r--coverage/backward.py1
-rw-r--r--coverage/collector.py2
-rw-r--r--coverage/config.py4
-rw-r--r--coverage/control.py3
-rw-r--r--coverage/execfile.py4
-rw-r--r--coverage/multiproc.py2
-rw-r--r--coverage/pytracer.py4
8 files changed, 11 insertions, 11 deletions
diff --git a/coverage/backunittest.py b/coverage/backunittest.py
index 242e9d39..078f48cc 100644
--- a/coverage/backunittest.py
+++ b/coverage/backunittest.py
@@ -18,7 +18,7 @@ class TestCase(unittest.TestCase):
`unittest` doesn't have them.
"""
- # pylint: disable=missing-docstring
+ # pylint: disable=arguments-differ, deprecated-method
if not unittest_has('assertCountEqual'):
def assertCountEqual(self, *args, **kwargs):
diff --git a/coverage/backward.py b/coverage/backward.py
index 2d0494a7..1d92469d 100644
--- a/coverage/backward.py
+++ b/coverage/backward.py
@@ -177,6 +177,7 @@ def import_local_file(modname, modfile=None):
if modfile is None:
modfile = modname + '.py'
if SourceFileLoader:
+ # pylint: disable=no-value-for-parameter, deprecated-method
mod = SourceFileLoader(modname, modfile).load_module()
else:
for suff in imp.get_suffixes(): # pragma: part covered
diff --git a/coverage/collector.py b/coverage/collector.py
index 024540eb..a032b70d 100644
--- a/coverage/collector.py
+++ b/coverage/collector.py
@@ -415,7 +415,7 @@ class Collector(object):
else:
break
else:
- raise runtime_err # pylint: disable=raising-bad-type
+ raise runtime_err
return dict((self.cached_abs_file(k), v) for k, v in items if v)
diff --git a/coverage/config.py b/coverage/config.py
index f7e1605b..30f46e58 100644
--- a/coverage/config.py
+++ b/coverage/config.py
@@ -31,11 +31,11 @@ class HandyConfigParser(configparser.RawConfigParser):
if our_file:
self.section_prefixes.append("")
- def read(self, filenames):
+ def read(self, filenames, encoding=None):
"""Read a file name as UTF-8 configuration data."""
kwargs = {}
if env.PYVERSION >= (3, 2):
- kwargs['encoding'] = "utf-8"
+ kwargs['encoding'] = encoding or "utf-8"
return configparser.RawConfigParser.read(self, filenames, **kwargs)
def has_option(self, section, option):
diff --git a/coverage/control.py b/coverage/control.py
index 76467257..93c633af 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -729,8 +729,7 @@ class Coverage(object):
def report(
self, morfs=None, show_missing=None, ignore_errors=None,
- file=None, # pylint: disable=redefined-builtin
- omit=None, include=None, skip_covered=None,
+ file=None, omit=None, include=None, skip_covered=None,
):
"""Write a textual summary report to `file`.
diff --git a/coverage/execfile.py b/coverage/execfile.py
index 97997b06..fbd0228c 100644
--- a/coverage/execfile.py
+++ b/coverage/execfile.py
@@ -194,7 +194,7 @@ class PyRunner(object):
# Execute the code object.
try:
exec(code, main_mod.__dict__)
- except SystemExit:
+ except SystemExit: # pylint: disable=try-except-raise
# The user called sys.exit(). Just pass it along to the upper
# layers, where it will be handled.
raise
@@ -217,7 +217,7 @@ class PyRunner(object):
if hasattr(err, "__traceback__"):
err.__traceback__ = err.__traceback__.tb_next
sys.excepthook(typ, err, tb.tb_next)
- except SystemExit:
+ except SystemExit: # pylint: disable=try-except-raise
raise
except Exception:
# Getting the output right in the case of excepthook
diff --git a/coverage/multiproc.py b/coverage/multiproc.py
index 62f6beb7..6e124267 100644
--- a/coverage/multiproc.py
+++ b/coverage/multiproc.py
@@ -22,7 +22,7 @@ else:
original_bootstrap = OriginalProcess._bootstrap
-class ProcessWithCoverage(OriginalProcess):
+class ProcessWithCoverage(OriginalProcess): # pylint: disable=abstract-method
"""A replacement for multiprocess.Process that starts coverage."""
def _bootstrap(self):
diff --git a/coverage/pytracer.py b/coverage/pytracer.py
index d0549f72..4ffe41e3 100644
--- a/coverage/pytracer.py
+++ b/coverage/pytracer.py
@@ -83,7 +83,7 @@ class PyTracer(object):
#self.log(":", frame.f_code.co_filename, frame.f_lineno, event)
- if (self.stopped and sys.gettrace() == self._trace):
+ if (self.stopped and sys.gettrace() == self._trace): # pylint: disable=comparison-with-callable
# The PyTrace.stop() method has been called, possibly by another
# thread, let's deactivate ourselves now.
#self.log("X", frame.f_code.co_filename, frame.f_lineno)
@@ -196,7 +196,7 @@ class PyTracer(object):
# so don't warn if we are in atexit on PyPy and the trace function
# has changed to None.
dont_warn = (env.PYPY and env.PYPYVERSION >= (5, 4) and self.in_atexit and tf is None)
- if (not dont_warn) and tf != self._trace:
+ if (not dont_warn) and tf != self._trace: # pylint: disable=comparison-with-callable
self.warn(
"Trace function changed, measurement is likely wrong: %r" % (tf,),
slug="trace-changed",