Update pylint to 1.5.6

1 files changed, 7 insertions, 6 deletions

diff --git a/tests/test_summary.py b/tests/test_summary.py
index c94c2ba1..c8abd7d8 100644
--- a/tests/test_summary.py
+++ b/tests/test_summary.py
@@ -420,6 +420,7 @@ class SummaryTest(CoverageTest):
             u"Couldn't parse 'accented\xe2.py' as Python source: 'error' at line 1"
         )
         if env.PY2:
+            # pylint: disable=redefined-variable-type
             expected = expected.encode(output_encoding())
         self.assertEqual(last, expected)
 
@@ -477,7 +478,7 @@ class SummaryTest(CoverageTest):
             """)
         cov = coverage.Coverage(branch=True, source=["."])
         cov.start()
-        import main     # pragma: nested # pylint: disable=import-error,unused-variable
+        import main     # pragma: nested # pylint: disable=import-error
         cov.stop()      # pragma: nested
         report = self.get_report(cov).splitlines()
         self.assertIn("mybranch.py 5 5 2 0 0%", report)
@@ -486,7 +487,7 @@ class SummaryTest(CoverageTest):
         """A helper for the next few tests."""
         cov = coverage.Coverage()
         cov.start()
-        import TheCode  # pragma: nested # pylint: disable=import-error,unused-variable
+        import TheCode  # pragma: nested # pylint: disable=import-error
         cov.stop()      # pragma: nested
         return self.get_report(cov)
 
@@ -521,7 +522,7 @@ class SummaryTest(CoverageTest):
             """)
         cov = coverage.Coverage()
         cov.start()
-        import start    # pragma: nested # pylint: disable=import-error,unused-variable
+        import start    # pragma: nested # pylint: disable=import-error
         cov.stop()      # pragma: nested
 
         report = self.get_report(cov)
@@ -541,7 +542,7 @@ class SummaryTest(CoverageTest):
         # Run the program.
         cov = coverage.Coverage()
         cov.start()
-        import main     # pragma: nested # pylint: disable=import-error,unused-variable
+        import main     # pragma: nested # pylint: disable=import-error
         cov.stop()      # pragma: nested
 
         report = self.get_report(cov).splitlines()
@@ -571,7 +572,7 @@ class SummaryTest(CoverageTest):
         # Run the program.
         cov = coverage.Coverage()
         cov.start()
-        import main     # pragma: nested # pylint: disable=import-error,unused-variable
+        import main     # pragma: nested # pylint: disable=import-error
         cov.stop()      # pragma: nested
 
         # Put back the missing Python file.
@@ -599,7 +600,7 @@ class SummaryTest2(CoverageTest):
         # statements, not one statement.
         cov = coverage.Coverage(branch=True)
         cov.start()
-        import usepkgs  # pragma: nested # pylint: disable=import-error,unused-variable
+        import usepkgs  # pragma: nested # pylint: disable=import-error
         cov.stop()      # pragma: nested
 
         repout = StringIO()