Pylint 0.23.0 'deprecated' disable-msg.

25 files changed, 31 insertions, 32 deletions

diff --git a/.pylintrc b/.pylintrc
index e3ef2885..aa2d07e2 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -53,7 +53,7 @@ load-plugins=
 #enable-msg=
 
 # Disable the message(s) with the given id(s).
-disable-msg= 
+disable= 
 # Messages that are just silly:
 #   I0011:106: Locally disabling E1101
 #   W0122: 30:run_python_file: Use of the exec statement
@@ -64,7 +64,6 @@ disable-msg=
 #   W0603: 28:call_singleton_method: Using the global statement
 #   W0703:133:CoverageData._read_file: Catch "Exception"
     I0011,W0122,W0142,W0232,C0323,C0324,W0603,W0703,
-
 # Messages that may be silly:
 #   R0201: 42:Tracer.stop: Method could be a function
 #   C0321: 80:CodeUnit.__lt__: More than one statement on a single line    
@@ -72,10 +71,10 @@ disable-msg=
 #   W0403:  4: Relative import 'coveragetest'
 #   E1103: 26:RunTests.test_run_python_file: Instance of 'file' has no 'getvalue' member (but some types could not be inferred)
     R0201,C0321,R0401,W0403,E1103,
-
 # Messages that are noisy for now, eventually maybe we'll turn them on:
 #   C0103:256:coverage.morf_filename: Invalid name "f" (should match [a-z_][a-z0-9_]{2,30}$)
-    C0103
+#   W0404: 22:run_tests_with_coverage: Reimport 'coverage' (imported line 18)
+    C0103,W0404
 
 [REPORTS]
 
diff --git a/Makefile b/Makefile
index 978d4051..1c7a446e 100644
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,8 @@ clean:
 LINTABLE = coverage setup.py test
 
 lint:
-	-python -x /Python25/Scripts/pylint.bat --rcfile=.pylintrc $(LINTABLE)
-	python /Python25/Lib/tabnanny.py $(LINTABLE)
+	-pylint --rcfile=.pylintrc $(LINTABLE)
+	python -m tabnanny $(LINTABLE)
 	python checkeol.py
 
 pep8:
diff --git a/coverage/backward.py b/coverage/backward.py
index 23c0a569..1217e9ef 100644
--- a/coverage/backward.py
+++ b/coverage/backward.py
@@ -1,7 +1,7 @@
 """Add things to old Pythons so I can pretend they are newer."""
 
 # This file does lots of tricky stuff, so disable a bunch of lintisms.
-# pylint: disable-msg=F0401,W0611,W0622
+# pylint: disable=F0401,W0611,W0622
 # F0401: Unable to import blah
 # W0611: Unused import blah
 # W0622: Redefining built-in blah
diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index e5d6bb84..18715b71 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -2,7 +2,7 @@
 
 import optparse, re, sys, traceback
 
-from coverage.backward import sorted                # pylint: disable-msg=W0622
+from coverage.backward import sorted                # pylint: disable=W0622
 from coverage.execfile import run_python_file
 from coverage.misc import CoverageException, ExceptionDuringRun
 
diff --git a/coverage/config.py b/coverage/config.py
index 1f6a879f..eda3c1c2 100644
--- a/coverage/config.py
+++ b/coverage/config.py
@@ -1,7 +1,7 @@
 """Config file for coverage.py"""
 
 import os
-from coverage.backward import configparser          # pylint: disable-msg=W0622
+from coverage.backward import configparser          # pylint: disable=W0622
 
 
 class CoverageConfig(object):
diff --git a/coverage/control.py b/coverage/control.py
index 4fae198c..8961a3c1 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -269,7 +269,7 @@ class coverage(object):
     # To log what should_trace returns, change this to "if 1:"
     if 0:
         _real_should_trace = _should_trace
-        def _should_trace(self, filename, frame):   # pylint: disable-msg=E0102
+        def _should_trace(self, filename, frame):   # pylint: disable=E0102
             """A logging decorator around the real _should_trace function."""
             ret = self._real_should_trace(filename, frame)
             print("should_trace: %r -> %r" % (filename, ret))
@@ -496,7 +496,7 @@ class coverage(object):
         return Analysis(self, it)
 
     def report(self, morfs=None, show_missing=True, ignore_errors=None,
-                file=None,                          # pylint: disable-msg=W0622
+                file=None,                          # pylint: disable=W0622
                 omit=None, include=None
                 ):
         """Write a summary report to `file`.
diff --git a/coverage/data.py b/coverage/data.py
index 3d750c42..5d482eac 100644
--- a/coverage/data.py
+++ b/coverage/data.py
@@ -2,7 +2,7 @@
 
 import os
 
-from coverage.backward import pickle, sorted        # pylint: disable-msg=W0622
+from coverage.backward import pickle, sorted        # pylint: disable=W0622
 
 
 class CoverageData(object):
diff --git a/coverage/html.py b/coverage/html.py
index bf49002f..87edad4d 100644
--- a/coverage/html.py
+++ b/coverage/html.py
@@ -2,7 +2,7 @@
 
 import os, re, shutil
 
-from coverage import __url__, __version__           # pylint: disable-msg=W0611
+from coverage import __url__, __version__           # pylint: disable=W0611
 from coverage.misc import CoverageException
 from coverage.phystokens import source_token_lines
 from coverage.report import Reporter
@@ -10,7 +10,7 @@ from coverage.templite import Templite
 
 # Disable pylint msg W0612, because a bunch of variables look unused, but
 # they're accessed in a Templite context via locals().
-# pylint: disable-msg=W0612
+# pylint: disable=W0612
 
 def data_filename(fname):
     """Return the path to a data file of ours."""
diff --git a/coverage/parser.py b/coverage/parser.py
index 60088ae8..8ad4e051 100644
--- a/coverage/parser.py
+++ b/coverage/parser.py
@@ -2,7 +2,7 @@
 
 import glob, opcode, os, re, sys, token, tokenize
 
-from coverage.backward import set, sorted, StringIO # pylint: disable-msg=W0622
+from coverage.backward import set, sorted, StringIO # pylint: disable=W0622
 from coverage.backward import open_source
 from coverage.bytecode import ByteCodes, CodeObjects
 from coverage.misc import nice_pair, CoverageException, NoSource, expensive
diff --git a/coverage/phystokens.py b/coverage/phystokens.py
index 60b87932..fc4f2c90 100644
--- a/coverage/phystokens.py
+++ b/coverage/phystokens.py
@@ -1,7 +1,7 @@
 """Better tokenizing for coverage.py."""
 
 import keyword, re, token, tokenize
-from coverage.backward import StringIO              # pylint: disable-msg=W0622
+from coverage.backward import StringIO              # pylint: disable=W0622
 
 def phys_tokens(toks):
     """Return all physical tokens, even line continuations.
diff --git a/coverage/results.py b/coverage/results.py
index 85071fe3..6cc49cd3 100644
--- a/coverage/results.py
+++ b/coverage/results.py
@@ -2,7 +2,7 @@
 
 import os
 
-from coverage.backward import set, sorted           # pylint: disable-msg=W0622
+from coverage.backward import set, sorted           # pylint: disable=W0622
 from coverage.misc import format_lines, NoSource
 from coverage.parser import CodeParser
 
diff --git a/coverage/xmlreport.py b/coverage/xmlreport.py
index 5eabac74..5f6cc87e 100644
--- a/coverage/xmlreport.py
+++ b/coverage/xmlreport.py
@@ -4,7 +4,7 @@ import os, sys, time
 import xml.dom.minidom
 
 from coverage import __url__, __version__
-from coverage.backward import sorted            # pylint: disable-msg=W0622
+from coverage.backward import sorted            # pylint: disable=W0622
 from coverage.report import Reporter
 
 def rate(hit, num):
diff --git a/setup.py b/setup.py
index fbdf071b..f0e92685 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@ else:
 use_setuptools()
 
 from setuptools import setup
-from distutils.core import Extension    # pylint: disable-msg=E0611,F0401
+from distutils.core import Extension    # pylint: disable=E0611,F0401
 
 # Get or massage our metadata.
 
diff --git a/test/backtest.py b/test/backtest.py
index e8d8366d..4576a865 100644
--- a/test/backtest.py
+++ b/test/backtest.py
@@ -1,6 +1,6 @@
 """Add things to old Pythons so I can pretend they are newer, for tests."""
 
-# pylint: disable-msg=W0622
+# pylint: disable=W0622
 # (Redefining built-in blah)
 # The whole point of this file is to redefine built-ins, so shut up about it.
 
diff --git a/test/backunittest.py b/test/backunittest.py
index f606185f..c1685e0c 100644
--- a/test/backunittest.py
+++ b/test/backunittest.py
@@ -2,7 +2,7 @@
 
 import difflib, re, sys, unittest
 
-from coverage.backward import set                   # pylint: disable-msg=W0622
+from coverage.backward import set                   # pylint: disable=W0622
 
 
 def _need(method):
diff --git a/test/coveragetest.py b/test/coveragetest.py
index 6eb34bff..ebff65aa 100644
--- a/test/coveragetest.py
+++ b/test/coveragetest.py
@@ -3,7 +3,7 @@
 import imp, os, random, shlex, shutil, sys, tempfile, textwrap
 
 import coverage
-from coverage.backward import sorted, StringIO      # pylint: disable-msg=W0622
+from coverage.backward import sorted, StringIO      # pylint: disable=W0622
 from backtest import run_command
 from backunittest import TestCase
 
@@ -167,7 +167,7 @@ class CoverageTest(TestCase):
             if suff[0] == '.py':
                 break
         try:
-            # pylint: disable-msg=W0631
+            # pylint: disable=W0631
             # (Using possibly undefined loop variable 'suff')
             mod = imp.load_module(modname, f, modfile, suff)
         finally:
diff --git a/test/meta_coverage.py b/test/meta_coverage.py
index 1c71abf0..ef0292ae 100644
--- a/test/meta_coverage.py
+++ b/test/meta_coverage.py
@@ -45,7 +45,7 @@ def run_tests_with_coverage():
             if hasattr(mod, '__file__') and mod.__file__.startswith(covdir):
                 covmods[name] = mod
                 del sys.modules[name]
-    import coverage     # don't warn about re-import: pylint: disable-msg=W0404
+    import coverage     # don't warn about re-import: pylint: disable=W0404
     #sys.modules.update(covmods)
 
     # Run nosetests, with the arguments from our command line.
diff --git a/test/test_api.py b/test/test_api.py
index 5952dfe7..aee0734a 100644
--- a/test/test_api.py
+++ b/test/test_api.py
@@ -314,7 +314,7 @@ class SourceOmitIncludeTest(CoverageTest):
         """
         cov = coverage.coverage(**kwargs)
         cov.start()
-        import usepkgs                      # pylint: disable-msg=F0401,W0612
+        import usepkgs                      # pylint: disable=F0401,W0612
         cov.stop()
         return cov.data.summary()
 
diff --git a/test/test_cmdline.py b/test/test_cmdline.py
index aa72b340..a9858d51 100644
--- a/test/test_cmdline.py
+++ b/test/test_cmdline.py
@@ -372,7 +372,7 @@ class FakeCoverageForDebugData(object):
         """Fake coverage().data.has_arcs()"""
         return False
 
-    def summary(self, fullpath):                    # pylint: disable-msg=W0613
+    def summary(self, fullpath):                    # pylint: disable=W0613
         """Fake coverage().data.summary()"""
         return self._summary
 
diff --git a/test/test_codeunit.py b/test/test_codeunit.py
index 7903d153..b543949c 100644
--- a/test/test_codeunit.py
+++ b/test/test_codeunit.py
@@ -8,7 +8,7 @@ from coverage.files import FileLocator
 sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
 from coveragetest import CoverageTest
 
-# pylint: disable-msg=F0401
+# pylint: disable=F0401
 # Unable to import 'aa' (No module named aa)
 
 class CodeUnitTest(CoverageTest):
diff --git a/test/test_farm.py b/test/test_farm.py
index 79b345a6..70415317 100644
--- a/test/test_farm.py
+++ b/test/test_farm.py
@@ -3,7 +3,7 @@
 import difflib, filecmp, fnmatch, glob, os, re, shutil, sys
 
 sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from backtest import run_command, execfile          # pylint: disable-msg=W0622
+from backtest import run_command, execfile          # pylint: disable=W0622
 
 
 def test_farm(clean_only=False):
diff --git a/test/test_files.py b/test/test_files.py
index 4ffc6ca2..9cbaf9c4 100644
--- a/test/test_files.py
+++ b/test/test_files.py
@@ -4,7 +4,7 @@ import os, sys
 
 from coverage.files import FileLocator, TreeMatcher, FnmatchMatcher
 from coverage.files import find_python_files
-from coverage.backward import set                   # pylint: disable-msg=W0622
+from coverage.backward import set                   # pylint: disable=W0622
 
 sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
 from coveragetest import CoverageTest
diff --git a/test/test_summary.py b/test/test_summary.py
index fcc26125..5a689129 100644
--- a/test/test_summary.py
+++ b/test/test_summary.py
@@ -143,7 +143,7 @@ class SummaryTest2(CoverageTest):
     def test_empty_files(self):
         cov = coverage.coverage()
         cov.start()
-        import usepkgs                      # pylint: disable-msg=F0401,W0612
+        import usepkgs                      # pylint: disable=F0401,W0612
         cov.stop()
 
         repout = StringIO()
diff --git a/test/test_templite.py b/test/test_templite.py
index 93e9183d..0435c545 100644
--- a/test/test_templite.py
+++ b/test/test_templite.py
@@ -3,7 +3,7 @@
 from coverage.templite import Templite
 import unittest
 
-# pylint: disable-msg=W0612,E1101
+# pylint: disable=W0612,E1101
 # Disable W0612 (Unused variable) and
 # E1101 (Instance of 'foo' has no 'bar' member)
 
diff --git a/test/test_testing.py b/test/test_testing.py
index 67f4412c..66a4093c 100644
--- a/test/test_testing.py
+++ b/test/test_testing.py
@@ -5,7 +5,7 @@ sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
 from backunittest import TestCase
 from coveragetest import CoverageTest
 
-from coverage.backward import set                   # pylint: disable-msg=W0622
+from coverage.backward import set                   # pylint: disable=W0622
 
 class TestingTest(TestCase):
     """Tests of helper methods on `backunittest.TestCase`."""