Clean up some pylint

4 files changed, 9 insertions, 6 deletions

diff --git a/coverage/collector.py b/coverage/collector.py
index 4cb00190..3f557aa5 100644
--- a/coverage/collector.py
+++ b/coverage/collector.py
@@ -84,13 +84,13 @@ class Collector(object):
 
         try:
             if concurrency == "greenlet":
-                import greenlet                 # pylint: disable=import-error
+                import greenlet                 # pylint: disable=import-error,useless-suppression
                 self.concur_id_func = greenlet.getcurrent
             elif concurrency == "eventlet":
-                import eventlet.greenthread     # pylint: disable=import-error
+                import eventlet.greenthread     # pylint: disable=import-error,useless-suppression
                 self.concur_id_func = eventlet.greenthread.getcurrent
             elif concurrency == "gevent":
-                import gevent                   # pylint: disable=import-error
+                import gevent                   # pylint: disable=import-error,useless-suppression
                 self.concur_id_func = gevent.getcurrent
             elif concurrency == "thread" or not concurrency:
                 # It's important to import threading only if we need it.  If
diff --git a/coverage/plugin_support.py b/coverage/plugin_support.py
index a1a7b733..4f22c137 100644
--- a/coverage/plugin_support.py
+++ b/coverage/plugin_support.py
@@ -37,6 +37,8 @@ class Plugins(object):
                 debug.write("Loaded plugin %r: %r" % (module, plugin))
                 labelled = LabelledDebug("plugin %r" % (module,), debug)
                 plugin = DebugPluginWrapper(plugin, labelled)
+
+            # pylint: disable=attribute-defined-outside-init
             plugin._coverage_plugin_name = module
             plugin._coverage_enabled = True
             plugins.order.append(plugin)
diff --git a/tests/test_parser.py b/tests/test_parser.py
index 2cf39baa..b3f41dd5 100644
--- a/tests/test_parser.py
+++ b/tests/test_parser.py
@@ -119,6 +119,7 @@ class ParserFileTest(CoverageTest):
 
     def parse_file(self, filename):
         """Parse `text` as source, and return the `PythonParser` used."""
+        # pylint: disable=attribute-defined-outside-init
         parser = PythonParser(filename=filename, exclude="nocover")
         self.statements, self.excluded = parser.parse_source()
         return parser
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
index 18edf66f..1ffb73bf 100644
--- a/tests/test_plugins.py
+++ b/tests/test_plugins.py
@@ -220,12 +220,10 @@ class PluginTest(CoverageTest):
 
 class PluginWarningOnPyTracer(CoverageTest):
     """Test that we get a controlled exception with plugins on PyTracer."""
-    def setUp(self):
-        super(PluginWarningOnPyTracer, self).setUp()
+    def test_exception_if_plugins_on_pytracer(self):
         if env.C_TRACER:
             self.skip("This test is only about PyTracer.")
 
-    def test_exception_if_plugins_on_pytracer(self):
         self.make_file("simple.py", """a = 1""")
 
         cov = coverage.Coverage()
@@ -233,6 +231,7 @@ class PluginWarningOnPyTracer(CoverageTest):
 
         warnings = []
         def capture_warning(msg):
+            """A fake implementation of Coverage._warn, to capture warnings."""
             warnings.append(msg)
         cov._warn = capture_warning
 
@@ -283,6 +282,7 @@ class GoodPluginTest(FileTracerTest):
         self.assertEqual(statements, [105, 106, 107, 205, 206, 207])
 
     def make_render_and_caller(self):
+        """Make the render.py and caller.py files we need."""
         # plugin2 emulates a dynamic tracing plugin: the caller's locals
         # are examined to determine the source file and line number.
         # The plugin is in tests/plugin2.py.