Merge remote-tracking branch 'origin/dev'

conftest.py

@@ -1,7 +1,9 @@
 import os
+import subprocess
 import urllib
 import zipfile
-import subprocess
+
+import pytest
 
 VSPEC_URL = 'https://github.com/kana/vim-vspec/archive/1.4.1.zip'
 CACHE_FOLDER = '.cache'
@@ -15,11 +17,12 @@ class IntegrationTestFile(object):
         self.path = path
 
     def run(self):
-        output = subprocess.check_output([VSPEC_RUNNER, '.', VSPEC_FOLDER, self.path])
+        output = subprocess.check_output(
+            [VSPEC_RUNNER, '.', VSPEC_FOLDER, self.path])
         for line in output.splitlines():
             if line.startswith(b'not ok') or line.startswith(b'Error'):
-                print(output.decode('utf-8'))
-                assert False
+                pytest.fail("{} failed:\n{}".format(
+                    self.path, output.decode('utf-8')), pytrace=False)
 
     def __repr__(self):
         return "<%s: %s>" % (type(self), self.path)

jedi_vim.py

@@ -218,7 +218,7 @@ def goto(is_definition=False, is_related_name=False, no_output=False):
                     echo_highlight("Cannot get the definition of Python keywords.")
                 else:
                     echo_highlight("Builtin modules cannot be displayed (%s)."
-                                   % d.module_path)
+                                   % d.desc_with_module)
             else:
                 if d.module_path != vim.current.buffer.name:
                     result = new_buffer(d.module_path)