Merge pull request #915 from davidhalter/typeshed

With typeshed coming to Jedi, builtin modules should be displayed

test/test_integration.py

@@ -56,10 +56,10 @@ def test_integration(install_vspec, path):
         if (line.startswith(b'not ok') or
                 line.startswith(b'Error') or
                 line.startswith(b'Bail out!')):
-            pytest.fail("{0} failed:\n{1}".format(
+            pytest.fail(u"{0} failed:\n{1}".format(
                 path, output.decode('utf-8')), pytrace=False)
         if not had_ok and line.startswith(b'ok'):
             had_ok = True
     if not had_ok:
-        pytest.fail("{0} failed: no 'ok' found:\n{1}".format(
+        pytest.fail(u"{0} failed: no 'ok' found:\n{1}".format(
             path, output.decode('utf-8')), pytrace=False)

test/vspec/goto.vim

@@ -2,7 +2,7 @@ let mapleader = '\'
 source plugin/jedi.vim
 source test/_utils.vim
 
-describe 'goto simple'
+describe 'goto simple:'
     before
         new
         set filetype=python
@@ -45,7 +45,7 @@ describe 'goto simple'
 end
 
 
-describe 'goto with tabs'
+describe 'goto with tabs:'
     before
         set filetype=python
         let g:jedi#use_tabs_not_buffers = 1

test/vspec/signatures.vim

@@ -39,9 +39,9 @@ describe 'signatures'
     it 'simple after CursorHoldI with only parenthesis'
         noautocmd normal o
         doautocmd CursorHoldI
-        noautocmd normal istr()
+        noautocmd normal istaticmethod()
         doautocmd CursorHoldI
-        Expect getline(1) == '?!?jedi=0, ?!?   (*_*object*_*) ?!?jedi?!?'
+        Expect getline(1) == '?!?jedi=0, ?!?            (*_*f: Callable*_*) ?!?jedi?!?'
     end
 
     it 'no signature'
@@ -64,11 +64,11 @@ describe 'signatures'
         let g:jedi#show_call_signatures = 2
         call jedi#configure_call_signatures()
 
-        exe 'normal ostr( '
+        exe 'normal ostaticmethod( '
         redir => msg
         Python jedi_vim.show_call_signatures()
         redir END
-        Expect msg == "\nstr(object)"
+        Expect msg == "\nstaticmethod(f: Callable)"
 
         redir => msg
         doautocmd InsertLeave