Clean up some pylint messages

5 files changed, 6 insertions, 6 deletions

diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index 3e3f7e44..1b4d322c 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -158,7 +158,7 @@ class CoverageOptionParser(optparse.OptionParser, object):
         """Used to stop the optparse error handler ending the process."""
         pass
 
-    def parse_args(self, args=None, options=None):
+    def parse_args_ok(self, args=None, options=None):
         """Call optparse.parse_args, but return a triple:
 
         (ok, options, args)
@@ -375,7 +375,7 @@ class CoverageScript(object):
             argv = argv[1:]
 
         parser.help_fn = self.help_fn
-        ok, options, args = parser.parse_args(argv)
+        ok, options, args = parser.parse_args_ok(argv)
         if not ok:
             return ERR
 
diff --git a/coverage/control.py b/coverage/control.py
index 6ab5b4e4..550293c7 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -314,6 +314,7 @@ class Coverage(object):
         """
         disp = FileDisposition(filename)
         def nope(disp, reason):
+            """Simple helper to make it easy to return NO."""
             disp.trace = False
             disp.reason = reason
             return disp
diff --git a/coverage/parser.py b/coverage/parser.py
index 8b9cc1ee..9041e349 100644
--- a/coverage/parser.py
+++ b/coverage/parser.py
@@ -216,7 +216,7 @@ class PythonParser(CodeParser):
         try:
             self._raw_parse()
         except (tokenize.TokenError, IndentationError) as tokerr:
-            msg, lineno = tokerr.args
+            msg, lineno = tokerr.args   # pylint: disable=unpacking-non-sequence
             raise NotPython(
                 "Couldn't parse '%s' as Python source: '%s' at %s" %
                     (self.filename, msg, lineno)
diff --git a/setup.py b/setup.py
index 7139ce3f..53ed2b13 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ import os, sys
 
 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
+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
 
 # Get or massage our metadata.  We exec coverage/version.py so we can avoid
diff --git a/tests/test_misc.py b/tests/test_misc.py
index a2b39a82..977378d5 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -88,8 +88,8 @@ class OverridesTest(CoverageTest):
     run_in_temp_dir = False
 
     def test_overrides(self):
+        # pylint: disable=missing-docstring
         class SomeBase(object):
-            """Base class, two base methods."""
             def method1(self):
                 pass
 
@@ -97,7 +97,6 @@ class OverridesTest(CoverageTest):
                 pass
 
         class Derived1(SomeBase):
-            """Simple single inheritance."""
             def method1(self):
                 pass