diff options
| -rw-r--r-- | coverage/config.py | 2 | ||||
| -rw-r--r-- | requirements/dev.pip | 2 | ||||
| -rw-r--r-- | tests/goldtest.py | 4 | ||||
| -rw-r--r-- | tests/test_api.py | 6 | ||||
| -rw-r--r-- | tests/test_html.py | 12 | ||||
| -rw-r--r-- | tests/test_process.py | 2 | ||||
| -rw-r--r-- | tests/test_summary.py | 12 |
7 files changed, 20 insertions, 20 deletions
diff --git a/coverage/config.py b/coverage/config.py index d6f5af0a..c7d6555c 100644 --- a/coverage/config.py +++ b/coverage/config.py @@ -21,7 +21,7 @@ class HandyConfigParser(configparser.RawConfigParser): configparser.RawConfigParser.__init__(self) self.section_prefix = section_prefix - def read(self, filename): + def read(self, filename): # pylint: disable=arguments-differ """Read a file name as UTF-8 configuration data.""" kwargs = {} if sys.version_info >= (3, 2): diff --git a/requirements/dev.pip b/requirements/dev.pip index 12673d8b..6858c6cc 100644 --- a/requirements/dev.pip +++ b/requirements/dev.pip @@ -13,7 +13,7 @@ greenlet==0.4.10 mock==2.0.0 PyContracts==1.7.9 pyenchant==1.6.6 -pylint==1.5.6 +pylint==1.6.4 unittest-mixins==1.1.1 # for kitting. diff --git a/tests/goldtest.py b/tests/goldtest.py index 8ebbd591..27a082ee 100644 --- a/tests/goldtest.py +++ b/tests/goldtest.py @@ -6,9 +6,9 @@ import os import sys -from tests.coveragetest import CoverageTest - from unittest_mixins import change_dir # pylint: disable=unused-import + +from tests.coveragetest import CoverageTest from tests.test_farm import clean # Import helpers, eventually test_farm.py will go away. from tests.test_farm import ( # pylint: disable=unused-import diff --git a/tests/test_api.py b/tests/test_api.py index 9feea5bf..6f142100 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -452,7 +452,7 @@ class SourceOmitIncludeTest(OmitIncludeTestsMixin, CoverageTest): """ cov = coverage.Coverage(**kwargs) cov.start() - import usepkgs # pragma: nested # pylint: disable=import-error + import usepkgs # pragma: nested # pylint: disable=import-error, unused-variable cov.stop() # pragma: nested data = cov.get_data() summary = data.line_counts() @@ -491,7 +491,7 @@ class ReportIncludeOmitTest(OmitIncludeTestsMixin, CoverageTest): """Try coverage.report().""" cov = coverage.Coverage() cov.start() - import usepkgs # pragma: nested # pylint: disable=import-error + import usepkgs # pragma: nested # pylint: disable=import-error, unused-variable cov.stop() # pragma: nested report = StringIO() cov.report(file=report, **kwargs) @@ -510,7 +510,7 @@ class XmlIncludeOmitTest(OmitIncludeTestsMixin, CoverageTest): """Try coverage.xml_report().""" cov = coverage.Coverage() cov.start() - import usepkgs # pragma: nested # pylint: disable=import-error + import usepkgs # pragma: nested # pylint: disable=import-error, unused-variable 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 eaf7d7d0..1df602f2 100644 --- a/tests/test_html.py +++ b/tests/test_html.py @@ -600,7 +600,7 @@ class HtmlGoldTests(CoverageGoldTest): # pylint: disable=import-error cov = coverage.Coverage(include=["./*"]) cov.start() - import main # pragma: nested + import main # pragma: nested # pylint: disable=unused-variable cov.stop() # pragma: nested cov.html_report(directory="../out/omit_1") @@ -613,7 +613,7 @@ class HtmlGoldTests(CoverageGoldTest): # pylint: disable=import-error cov = coverage.Coverage(include=["./*"]) cov.start() - import main # pragma: nested + import main # pragma: nested # pylint: disable=unused-variable cov.stop() # pragma: nested cov.html_report(directory="../out/omit_2", omit=["m1.py"]) @@ -626,7 +626,7 @@ class HtmlGoldTests(CoverageGoldTest): # pylint: disable=import-error cov = coverage.Coverage(include=["./*"]) cov.start() - import main # pragma: nested + import main # pragma: nested # pylint: disable=unused-variable cov.stop() # pragma: nested cov.html_report(directory="../out/omit_3", omit=["m1.py", "m2.py"]) @@ -639,7 +639,7 @@ class HtmlGoldTests(CoverageGoldTest): # pylint: disable=import-error cov = coverage.Coverage(config_file="omit4.ini", include=["./*"]) cov.start() - import main # pragma: nested + import main # pragma: nested # pylint: disable=unused-variable cov.stop() # pragma: nested cov.html_report(directory="../out/omit_4") @@ -652,7 +652,7 @@ class HtmlGoldTests(CoverageGoldTest): # pylint: disable=import-error cov = coverage.Coverage(config_file="omit5.ini", include=["./*"]) cov.start() - import main # pragma: nested + import main # pragma: nested # pylint: disable=unused-variable cov.stop() # pragma: nested cov.html_report() @@ -666,7 +666,7 @@ class HtmlGoldTests(CoverageGoldTest): sys.path.insert(0, "../othersrc") cov = coverage.Coverage(include=["./*", "../othersrc/*"]) cov.start() - import here # pragma: nested + import here # pragma: nested # pylint: disable=unused-variable cov.stop() # pragma: nested cov.html_report(directory="../out/other") diff --git a/tests/test_process.py b/tests/test_process.py index f7f46ab0..ec19aed9 100644 --- a/tests/test_process.py +++ b/tests/test_process.py @@ -1110,7 +1110,7 @@ class ProcessStartupTest(ProcessCoverageMixin, CoverageTest): data_file = .mycovdata """) self.set_environ("COVERAGE_PROCESS_START", "coverage.ini") - import main # pylint: disable=import-error + import main # pylint: disable=import-error, unused-variable 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 c8abd7d8..bda65681 100644 --- a/tests/test_summary.py +++ b/tests/test_summary.py @@ -478,7 +478,7 @@ class SummaryTest(CoverageTest): """) cov = coverage.Coverage(branch=True, source=["."]) cov.start() - import main # pragma: nested # pylint: disable=import-error + import main # pragma: nested # pylint: disable=import-error, unused-variable cov.stop() # pragma: nested report = self.get_report(cov).splitlines() self.assertIn("mybranch.py 5 5 2 0 0%", report) @@ -487,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 + import TheCode # pragma: nested # pylint: disable=import-error, unused-variable cov.stop() # pragma: nested return self.get_report(cov) @@ -522,7 +522,7 @@ class SummaryTest(CoverageTest): """) cov = coverage.Coverage() cov.start() - import start # pragma: nested # pylint: disable=import-error + import start # pragma: nested # pylint: disable=import-error, unused-variable cov.stop() # pragma: nested report = self.get_report(cov) @@ -542,7 +542,7 @@ class SummaryTest(CoverageTest): # Run the program. cov = coverage.Coverage() cov.start() - import main # pragma: nested # pylint: disable=import-error + import main # pragma: nested # pylint: disable=import-error, unused-variable cov.stop() # pragma: nested report = self.get_report(cov).splitlines() @@ -572,7 +572,7 @@ class SummaryTest(CoverageTest): # Run the program. cov = coverage.Coverage() cov.start() - import main # pragma: nested # pylint: disable=import-error + import main # pragma: nested # pylint: disable=import-error, unused-variable cov.stop() # pragma: nested # Put back the missing Python file. @@ -600,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 + import usepkgs # pragma: nested # pylint: disable=import-error, unused-variable cov.stop() # pragma: nested repout = StringIO() |