Quiet pylint

4 files changed, 11 insertions, 7 deletions

diff --git a/coverage/sqldata.py b/coverage/sqldata.py
index 044ddbf1..499f43c3 100644
--- a/coverage/sqldata.py
+++ b/coverage/sqldata.py
@@ -256,8 +256,8 @@ class CoverageData(SimpleReprMixin):
                 self._has_arcs = bool(int(row[0]))
                 self._has_lines = not self._has_arcs
 
-            for path, id in db.execute("select path, id from file"):
-                self._file_map[path] = id
+            for path, file_id in db.execute("select path, id from file"):
+                self._file_map[path] = file_id
 
     def _connect(self):
         """Get the SqliteDb object to use."""
@@ -482,7 +482,9 @@ class CoverageData(SimpleReprMixin):
         re-map paths to match the local machine's.
         """
         if self._debug.should('dataop'):
-            self._debug.write("Updating with data from %r" % (getattr(other_data, '_filename', '???'),))
+            self._debug.write("Updating with data from %r" % (
+                getattr(other_data, '_filename', '???'),
+            ))
         if self._has_lines and other_data._has_arcs:
             raise CoverageException("Can't combine arc data with line data")
         if self._has_arcs and other_data._has_lines:
diff --git a/igor.py b/igor.py
index 5d7828c3..e86c5ff9 100644
--- a/igor.py
+++ b/igor.py
@@ -229,7 +229,6 @@ def do_zip_mods():
 def do_install_egg():
     """Install the egg1 egg for tests."""
     # I am pretty certain there are easier ways to install eggs...
-    # pylint: disable=import-error,no-name-in-module
     cur_dir = os.getcwd()
     os.chdir("tests/eggsrc")
     with ignore_warnings():
diff --git a/setup.py b/setup.py
index c500ae6e..09d4eb17 100644
--- a/setup.py
+++ b/setup.py
@@ -11,9 +11,9 @@ 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, 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
+from distutils.core import Extension                # pylint: disable=wrong-import-order
+from distutils.command.build_ext import build_ext   # pylint: disable=wrong-import-order
+from distutils import errors                        # pylint: disable=wrong-import-order
 
 
 # Get or massage our metadata.  We exec coverage/version.py so we can avoid
diff --git a/tests/test_context.py b/tests/test_context.py
index 72739ad0..b002b603 100644
--- a/tests/test_context.py
+++ b/tests/test_context.py
@@ -73,6 +73,7 @@ class StaticContextTest(CoverageTest):
             fblue = full_names['blue.py']
 
             def assert_combined_lines(filename, context, lines):
+                # pylint: disable=cell-var-from-loop
                 combined.set_query_context(context)
                 self.assertEqual(combined.lines(filename), lines)
 
@@ -97,6 +98,7 @@ class StaticContextTest(CoverageTest):
             fblue = full_names['blue.py']
 
             def assert_combined_lines(filename, context, lines):
+                # pylint: disable=cell-var-from-loop
                 combined.set_query_context(context)
                 self.assertEqual(combined.lines(filename), lines)
 
@@ -106,6 +108,7 @@ class StaticContextTest(CoverageTest):
             assert_combined_lines(fblue, 'blue', self.LINES)
 
             def assert_combined_arcs(filename, context, lines):
+                # pylint: disable=cell-var-from-loop
                 combined.set_query_context(context)
                 self.assertEqual(combined.arcs(filename), lines)