Update pylint to 1.5.6

4 files changed, 19 insertions, 16 deletions

diff --git a/tests/test_api.py b/tests/test_api.py
index 4ee99a1b..27092098 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -429,7 +429,7 @@ class SourceOmitIncludeTest(OmitIncludeTestsMixin, CoverageTest):
         """
         cov = coverage.Coverage(**kwargs)
         cov.start()
-        import usepkgs  # pragma: nested   # pylint: disable=import-error,unused-variable
+        import usepkgs  # pragma: nested   # pylint: disable=import-error
         cov.stop()      # pragma: nested
         data = cov.get_data()
         summary = data.line_counts()
@@ -468,7 +468,7 @@ class ReportIncludeOmitTest(OmitIncludeTestsMixin, CoverageTest):
         """Try coverage.report()."""
         cov = coverage.Coverage()
         cov.start()
-        import usepkgs  # pragma: nested   # pylint: disable=import-error,unused-variable
+        import usepkgs  # pragma: nested   # pylint: disable=import-error
         cov.stop()      # pragma: nested
         report = StringIO()
         cov.report(file=report, **kwargs)
@@ -487,7 +487,7 @@ class XmlIncludeOmitTest(OmitIncludeTestsMixin, CoverageTest):
         """Try coverage.xml_report()."""
         cov = coverage.Coverage()
         cov.start()
-        import usepkgs  # pragma: nested   # pylint: disable=import-error,unused-variable
+        import usepkgs  # pragma: nested   # pylint: disable=import-error
         cov.stop()      # pragma: nested
         cov.xml_report(outfile="-", **kwargs)
         return self.stdout()
diff --git a/tests/test_html.py b/tests/test_html.py
index e16bf879..dda2e4b6 100644
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -597,7 +597,7 @@ class HtmlGoldTests(CoverageGoldTest):
         self.output_dir("out/omit_1")
 
         with change_dir("src"):
-            # pylint: disable=import-error, unused-variable
+            # pylint: disable=import-error
             cov = coverage.Coverage(include=["./*"])
             cov.start()
             import main         # pragma: nested
@@ -610,7 +610,7 @@ class HtmlGoldTests(CoverageGoldTest):
         self.output_dir("out/omit_2")
 
         with change_dir("src"):
-            # pylint: disable=import-error, unused-variable
+            # pylint: disable=import-error
             cov = coverage.Coverage(include=["./*"])
             cov.start()
             import main         # pragma: nested
@@ -623,7 +623,7 @@ class HtmlGoldTests(CoverageGoldTest):
         self.output_dir("out/omit_3")
 
         with change_dir("src"):
-            # pylint: disable=import-error, unused-variable
+            # pylint: disable=import-error
             cov = coverage.Coverage(include=["./*"])
             cov.start()
             import main         # pragma: nested
@@ -636,7 +636,7 @@ class HtmlGoldTests(CoverageGoldTest):
         self.output_dir("out/omit_4")
 
         with change_dir("src"):
-            # pylint: disable=import-error, unused-variable
+            # pylint: disable=import-error
             cov = coverage.Coverage(config_file="omit4.ini", include=["./*"])
             cov.start()
             import main         # pragma: nested
@@ -649,7 +649,7 @@ class HtmlGoldTests(CoverageGoldTest):
         self.output_dir("out/omit_5")
 
         with change_dir("src"):
-            # pylint: disable=import-error, unused-variable
+            # pylint: disable=import-error
             cov = coverage.Coverage(config_file="omit5.ini", include=["./*"])
             cov.start()
             import main         # pragma: nested
@@ -662,7 +662,7 @@ class HtmlGoldTests(CoverageGoldTest):
         self.output_dir("out/other")
 
         with change_dir("src"):
-            # pylint: disable=import-error, unused-variable
+            # pylint: disable=import-error
             sys.path.insert(0, "../othersrc")
             cov = coverage.Coverage(include=["./*", "../othersrc/*"])
             cov.start()
diff --git a/tests/test_process.py b/tests/test_process.py
index 701edecf..5298b722 100644
--- a/tests/test_process.py
+++ b/tests/test_process.py
@@ -945,6 +945,7 @@ class UnicodeFilePathsTest(CoverageTest):
         )
 
         if env.PY2:
+            # pylint: disable=redefined-variable-type
             report_expected = report_expected.encode(output_encoding())
 
         out = self.run_command("coverage report")
@@ -983,6 +984,7 @@ class UnicodeFilePathsTest(CoverageTest):
         )
 
         if env.PY2:
+            # pylint: disable=redefined-variable-type
             report_expected = report_expected.encode(output_encoding())
 
         out = self.run_command("coverage report")
@@ -1053,7 +1055,7 @@ class ProcessStartupTest(ProcessCoverageMixin, CoverageTest):
             data_file = .mycovdata
             """)
         self.set_environ("COVERAGE_PROCESS_START", "coverage.ini")
-        import main             # pylint: disable=import-error,unused-variable
+        import main             # pylint: disable=import-error
 
         with open("out.txt") as f:
             self.assertEqual(f.read(), "Hello, world!\n")
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()