Fix code run and documentation search for windows users

klen · klen · commit dc47efffb8d6 · 2012-02-12T12:35:34.000+04:00
diff --git a/autoload/pymode/doc.vim b/autoload/pymode/doc.vim
@@ -2,10 +2,13 @@ fun! pymode#doc#Show(word) "{{{
     if a:word == ''
         echoerr "No name/symbol under cursor!"
     else
-        call pymode#TempBuffer()
+        py sys.stdout, _ = StringIO.StringIO(), sys.stdout
+        py help(vim.eval('a:word'))
+        py sys.stdout, out = _, sys.stdout.getvalue()
         redi @">
-        sil!py help(vim.eval('a:word'))
+        sil!py print out
         redi END
+        call pymode#TempBuffer()
         normal Pdd
         wincmd p
     endif
diff --git a/autoload/pymode/run.vim b/autoload/pymode/run.vim
@@ -1,11 +1,10 @@
 " DESC: Save file if it modified and run python code
 fun! pymode#run#Run(line1, line2) "{{{
     if &modifiable && &modified | write | endif	
-    let f = expand("%:p")
-    call pymode#TempBuffer()
     redi @">
-    exe "sil!py execfile('" . l:f . "')"
+    sil!py execfile(vim.eval('expand("%s:p")'))
     redi END
+    call pymode#TempBuffer()
     normal Pdd
     wincmd p
 endfunction "}}}
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -22,7 +22,7 @@ endif
 " DESC: Fix python path
 if !pymode#Default('g:pymode_path', 1) || g:pymode_path
 python << EOF
-import sys, vim, os
+import sys, vim, os, StringIO
 
 curpath = vim.eval("getcwd()")
 libpath = os.path.join(os.path.dirname(os.path.dirname(
