Pylint 1.8.1, and fix its new warnings

7 files changed, 8 insertions, 4 deletions

diff --git a/coverage/collector.py b/coverage/collector.py
index 658aed62..72ab32b6 100644
--- a/coverage/collector.py
+++ b/coverage/collector.py
@@ -43,6 +43,7 @@ def should_start_context(frame):
     fn_name = frame.f_code.co_name
     if fn_name.startswith("test"):
         return fn_name
+    return None
 
 
 class Collector(object):
diff --git a/coverage/pytracer.py b/coverage/pytracer.py
index 1a5fe3c4..7e70bab6 100644
--- a/coverage/pytracer.py
+++ b/coverage/pytracer.py
@@ -88,7 +88,7 @@ class PyTracer(object):
             # thread, let's deactivate ourselves now.
             #self.log("X", frame.f_code.co_filename, frame.f_lineno)
             sys.settrace(None)
-            return
+            return None
 
         if self.last_exc_back:
             if frame == self.last_exc_back:
diff --git a/igor.py b/igor.py
index 83ed229d..43ce3303 100644
--- a/igor.py
+++ b/igor.py
@@ -177,7 +177,7 @@ def do_test_with_tracer(tracer, *runner_args):
     skip_msg = should_skip(tracer)
     if skip_msg:
         print(skip_msg)
-        return
+        return None
 
     os.environ["COVERAGE_TEST_TRACER"] = tracer
     if os.environ.get("COVERAGE_COVERAGE", ""):
@@ -376,6 +376,7 @@ def main(args):
         # If a handler returns a failure-like value, stop.
         if ret:
             return ret
+    return 0
 
 
 if __name__ == '__main__':
diff --git a/requirements/dev.pip b/requirements/dev.pip
index 888b4493..67999c23 100644
--- a/requirements/dev.pip
+++ b/requirements/dev.pip
@@ -13,7 +13,7 @@ greenlet==0.4.12
 mock==2.0.0
 PyContracts==1.7.15
 pyenchant==1.6.11
-pylint==1.7.4
+pylint==1.8.1
 unittest-mixins==1.4
 
 # for kitting.
diff --git a/tests/plugin1.py b/tests/plugin1.py
index 63ebacf7..42769950 100644
--- a/tests/plugin1.py
+++ b/tests/plugin1.py
@@ -15,6 +15,7 @@ class Plugin(coverage.CoveragePlugin):
         """Trace only files named xyz.py"""
         if "xyz.py" in filename:
             return FileTracer(filename)
+        return None
 
     def file_reporter(self, filename):
         return FileReporter(filename)
diff --git a/tests/plugin2.py b/tests/plugin2.py
index 3bdfbdfd..9651ce63 100644
--- a/tests/plugin2.py
+++ b/tests/plugin2.py
@@ -13,6 +13,7 @@ class Plugin(coverage.CoveragePlugin):
     def file_tracer(self, filename):
         if "render.py" in filename:
             return RenderFileTracer()
+        return None
 
     def file_reporter(self, filename):
         return FileReporter(filename)
diff --git a/tests/test_execfile.py b/tests/test_execfile.py
index 032eaa29..693df71a 100644
--- a/tests/test_execfile.py
+++ b/tests/test_execfile.py
@@ -101,7 +101,7 @@ class RunFileTest(CoverageTest):
 class RunPycFileTest(CoverageTest):
     """Test cases for `run_python_file`."""
 
-    def make_pyc(self):
+    def make_pyc(self):                     # pylint: disable=inconsistent-return-statements
         """Create a .pyc file, and return the relative path to it."""
         if env.JYTHON:
             self.skipTest("Can't make .pyc files on Jython")