Update pylint to 1.5.6

5 files changed, 9 insertions, 5 deletions

diff --git a/coverage/backward.py b/coverage/backward.py
index 50d49a0..700c3eb 100644
--- a/coverage/backward.py
+++ b/coverage/backward.py
@@ -6,7 +6,7 @@
 # This file does lots of tricky stuff, so disable a bunch of pylint warnings.
 # pylint: disable=redefined-builtin
 # pylint: disable=unused-import
-# pylint: disable=no-name-in-module
+# pxlint: disable=no-name-in-module
 
 import sys
 
@@ -47,7 +47,7 @@ except ImportError:
 try:
     range = xrange
 except NameError:
-    range = range
+    range = range       # pylint: disable=redefined-variable-type
 
 # shlex.quote is new, but there's an undocumented implementation in "pipes",
 # who knew!?
diff --git a/coverage/collector.py b/coverage/collector.py
index a296b22..5668877 100644
--- a/coverage/collector.py
+++ b/coverage/collector.py
@@ -17,7 +17,7 @@ os = isolate_module(os)
 
 try:
     # Use the C extension code when we can, for speed.
-    from coverage.tracer import CTracer, CFileDisposition   # pylint: disable=no-name-in-module
+    from coverage.tracer import CTracer, CFileDisposition
 except ImportError:
     # Couldn't import the C extension, maybe it isn't built.
     if os.getenv('COVERAGE_TEST_TRACER') == 'c':
diff --git a/coverage/control.py b/coverage/control.py
index f350b3d..9bd0def 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -123,6 +123,7 @@ class Coverage(object):
 
         # 2: from the rcfile, .coveragerc or setup.cfg file:
         if config_file:
+            # pylint: disable=redefined-variable-type
             did_read_rc = False
             # Some API users were specifying ".coveragerc" to mean the same as
             # True, so make it so.
@@ -322,7 +323,8 @@ class Coverage(object):
             # When testing, we use PyContracts, which should be considered
             # part of coverage.py, and it uses six. Exclude those directories
             # just as we exclude ourselves.
-            import contracts, six
+            import contracts
+            import six
             for mod in [contracts, six]:
                 self.cover_dirs.append(self._canonical_dir(mod))
 
@@ -921,6 +923,7 @@ class Coverage(object):
                 )
 
         if file_reporter == "python":
+            # pylint: disable=redefined-variable-type
             file_reporter = PythonFileReporter(morf, self)
 
         return file_reporter
diff --git a/coverage/monkey.py b/coverage/monkey.py
index e7517bf..d0bdf00 100644
--- a/coverage/monkey.py
+++ b/coverage/monkey.py
@@ -64,7 +64,7 @@ def patch_multiprocessing():
     # re-applies the monkey-patch.
     # Windows only spawns, so this is needed to keep Windows working.
     try:
-        from multiprocessing import spawn           # pylint: disable=no-name-in-module
+        from multiprocessing import spawn
         original_get_preparation_data = spawn.get_preparation_data
     except (ImportError, AttributeError):
         pass
diff --git a/coverage/parser.py b/coverage/parser.py
index 8fb5d89..c3dba83 100644
--- a/coverage/parser.py
+++ b/coverage/parser.py
@@ -106,6 +106,7 @@ class PythonParser(object):
         """
         combined = join_regex(regexes)
         if env.PY2:
+            # pylint: disable=redefined-variable-type
             combined = combined.decode("utf8")
         regex_c = re.compile(combined)
         matches = set()