Merge pull request prospector-dev#349 from rik/mypy-730-compat

Compatibility with mypy 0.730

prospector/tools/mypy/__init__.py

@@ -89,7 +89,9 @@ def configure(self, prospector_config, _):
     def run(self, found_files):
         paths = [path for path in found_files.iter_module_paths()]
         paths.extend(self.options)
-        result = self.checker.run(paths)
-        report, _ = result[0], result[1:]  # noqa
+        report, _ = self.checker.run(paths)
+        messages = report.splitlines()
+        if messages and messages[-1].startswith(('Found', 'Success')):
+            del messages[-1]
 
-        return [format_message(message) for message in report.splitlines()]
+        return [format_message(message) for message in messages]

tests/tools/mypy/test_mypy_tool.py

@@ -1,10 +1,17 @@
 # -*- coding: utf-8 -*-
+import sys
 from unittest import SkipTest, TestCase
 
 from prospector.message import Location, Message
 
+if sys.version_info >= (3, 0):
+    from unittest import mock
+else:
+    import mock
+
+
 try:
-    from prospector.tools.mypy import format_message
+    from prospector.tools.mypy import MypyTool, format_message
 except ImportError:
     raise SkipTest
 
@@ -40,3 +47,47 @@ def test_format_message_without_character(self):
             source="mypy", code="error", location=location, message="Important error"
         )
         self.assertEqual(format_message("file.py:17: error: Important error"), expected)
+
+    def test_pre730_format(self):
+        tool = MypyTool()
+        found_files = mock.MagicMock()
+        output = ['file.py:17: error: Important error', 'file.py:17:2: error: Important error']
+
+        with mock.patch('mypy.api.run') as mock_mypy:
+            mock_mypy.return_value = ('\n'.join(output), "unused")
+            messages = tool.run(found_files)
+
+        self.assertEqual(len(messages), len(output))
+
+    def test_pre730_format_empty(self):
+        tool = MypyTool()
+        found_files = mock.MagicMock()
+        output = []
+
+        with mock.patch('mypy.api.run') as mock_mypy:
+            mock_mypy.return_value = ('\n'.join(output), "unused")
+            messages = tool.run(found_files)
+
+        self.assertEqual(len(messages), len(output))
+
+    def test_post730_format(self):
+        tool = MypyTool()
+        found_files = mock.MagicMock()
+        output = ['file.py:17: error: Important error', 'file.py:17:2: error: Important error', 'Found 2 errors in 1 file (checked 63 source files)']
+
+        with mock.patch('mypy.api.run') as mock_mypy:
+            mock_mypy.return_value = ('\n'.join(output), "unused")
+            messages = tool.run(found_files)
+
+        self.assertEqual(len(messages), len(output) - 1)
+
+    def test_post730_format_empty(self):
+        tool = MypyTool()
+        found_files = mock.MagicMock()
+        output = ['Success: no issues found in 9 source files']
+
+        with mock.patch('mypy.api.run') as mock_mypy:
+            mock_mypy.return_value = ('\n'.join(output), "unused")
+            messages = tool.run(found_files)
+
+        self.assertEqual(len(messages), len(output) - 1)