Prepare to python3 support

Author: klen

AUTHORS

@@ -11,6 +11,7 @@ Contributors:
 * Denis Kasak (dkasak);
 * Steve Losh (sjl);
 * nixon;
+* lawrenceakka;
 * tramchamploo;
 * Benjamin Ruston (bruston);
 * Robert David Grant (bgrant);

autoload/pymode.vim

@@ -12,13 +12,6 @@ fun! pymode#Default(name, default) "{{{
 endfunction "}}}
 
 
-fun! pymode#Execute(expression) "{{{
-    " DESC: Execute an expression in the default python interpreter
-    "
-    execute 'python '.a:expression
-endfunction "}}}
-
-
 fun! pymode#Option(name) "{{{
 
     let name = 'b:pymode_' . a:name

autoload/pymode/breakpoint.vim

@@ -1,3 +1,4 @@
+" Quick set or delete a breakpoints
 fun! pymode#breakpoint#Set(lnum) "{{{
     let line = getline(a:lnum)
     if strridx(line, g:pymode_breakpoint_cmd) != -1
@@ -8,7 +9,7 @@ fun! pymode#breakpoint#Set(lnum) "{{{
         normal k
     endif
 
-    " Save file
+    " Save file without any events
     if &modifiable && &modified | noautocmd write | endif	
 
 endfunction "}}}

autoload/pymode/doc.vim

@@ -5,12 +5,11 @@ fun! pymode#doc#Show(word) "{{{
     if a:word == ''
         echoerr "No name/symbol under cursor!"
     else
-        call pymode#Execute("import StringIO")
-        call pymode#Execute("sys.stdout, _ = StringIO.StringIO(), sys.stdout")
-        call pymode#Execute("help('".a:word."')")
-        call pymode#Execute("sys.stdout, out = _, sys.stdout.getvalue()")
+        Python import StringIO
+        Python sys.stdout, _ = StringIO.StringIO(), sys.stdout
+        Python help(vim.eval('a:word'))
         call pymode#TempBuffer()
-        call pymode#Execute("vim.current.buffer.append(str(out).splitlines(), 0)")
+        Python vim.current.buffer.append(str(out).splitlines(), 0)
         wincmd p
     endif
 endfunction "}}}

autoload/pymode/lint.vim

@@ -14,8 +14,8 @@ fun! pymode#lint#Check() "{{{
 
     let g:pymode_lint_buffer = bufnr('%')
 
-    call pymode#Execute("from pymode import lint")
-    call pymode#Execute("lint.check_file()")
+    Python from pymode import lint
+    Python lint.check_file()
 
 endfunction " }}}
 
@@ -100,8 +100,8 @@ fun! pymode#lint#Auto() "{{{
             return 0
         endtry
     endif
-    call pymode#Execute("from pymode import auto")
-    call pymode#Execute("auto.fix_current_file()")
+    Python from pymode import auto
+    Python auto.fix_current_file()
     cclose
     edit
     call pymode#WideMessage("AutoPep8 done.")

autoload/pymode/path.vim

@@ -1,12 +1,17 @@
-fun! pymode#path#Activate(plugin_root) "{{{
-
-python << EOF
-import sys, vim, os
-
-curpath = vim.eval("getcwd()")
-libpath = os.path.join(vim.eval("a:plugin_root"), 'pylibs')
-
-sys.path = [libpath, curpath] + vim.eval("g:pymode_paths") + sys.path
-EOF
-
-endfunction "}}}
+fun! pymode#path#Activate(plugin_root) "{{{
+
+Python << EOF
+import sys, vim, os
+
+pymode_lib = 'pylibs'
+
+if sys.version >= (3, 0, 0):
+    pymode_lib = 'pylibs3'
+
+curpath = vim.eval("getcwd()")
+libpath = os.path.join(vim.eval("a:plugin_root"), pymode_lib)
+
+sys.path = [libpath, curpath] + vim.eval("g:pymode_paths") + sys.path
+EOF
+
+endfunction "}}}

autoload/pymode/queue.vim

@@ -1,8 +1,8 @@
 fun! pymode#queue#Poll() "{{{
 
     " Check current tasks
-    call pymode#Execute("from pymode import queue")
-    call pymode#Execute("queue.check_task()")
+    Python from pymode import queue
+    Python queue.check_task()
 
     " Update interval
     if mode() == 'i'

autoload/pymode/virtualenv.vim

@@ -12,7 +12,7 @@ fun! pymode#virtualenv#Activate() "{{{
 
     call add(g:pymode_virtualenv_enabled, $VIRTUAL_ENV)
 
-python << EOF
+Python << EOF
 import sys, vim, os
 
 ve_dir = vim.eval('$VIRTUAL_ENV')

ftplugin/python/init-pymode.vim

@@ -13,7 +13,7 @@ if pymode#Default('g:pymode', 1) || !g:pymode
 endif
 
 " DESC: Check python support
-if !has('python')
+if !has('python') && !has('python3')
     let g:pymode_virtualenv = 0
     let g:pymode_path       = 0
     let g:pymode_lint       = 0
@@ -23,6 +23,11 @@ if !has('python')
     let g:pymode_run        = 0
 endif
 
+if has('python')
+    command! -nargs=1 Python python <args>
+elseif has('python3')
+    command! -nargs=1 Python python3 <args>
+end
 
 " Virtualenv {{{
 
@@ -122,9 +127,9 @@ if !pymode#Default("g:pymode_lint", 1) || g:pymode_lint
         let g:pymode_lint_config = expand("<sfile>:p:h:h:h") . "/pylint.ini"
     endif
 
-    call pymode#Execute("from pymode import queue")
+    Python from pymode import queue
 
-    au VimLeavePre * call pymode#Execute("queue.stop_queue()")
+    au VimLeavePre * Python queue.stop_queue()
 
 endif
 
@@ -149,7 +154,7 @@ if !pymode#Default("g:pymode_breakpoint", 1) || g:pymode_breakpoint
 
     if !pymode#Default("g:pymode_breakpoint_cmd", "import pdb; pdb.set_trace()  # XXX BREAKPOINT")  && has("python")
 
-python << EOF
+Python << EOF
 from imp import find_module
 
 for module in ('pudb', 'ipdb'):
@@ -244,7 +249,7 @@ if !pymode#Default("g:pymode_rope", 1) || g:pymode_rope
     call pymode#Default("g:pymode_rope_always_show_complete_menu", 0)
 
     " DESC: Init Rope
-    call pymode#Execute("import ropevim")
+    Python import ropevim
 
     fun! RopeCodeAssistInsertMode() "{{{
         call RopeCodeAssist()
@@ -255,7 +260,7 @@ if !pymode#Default("g:pymode_rope", 1) || g:pymode_rope
         if isdirectory(getcwd() . '/.ropeproject')
             " In order to pass it the quiet kwarg I need to open the project
             " using python and not vim, which should be no major issue
-            call pymode#Execute("ropevim._interface.open_project(quiet=True)")
+            Python ropevim._interface.open_project(quiet=True)
             return ""
         endif
     endfunction "}}}
@@ -267,7 +272,7 @@ if !pymode#Default("g:pymode_rope", 1) || g:pymode_rope
 
     fun! RopeOmni(findstart, base) "{{{
         if a:findstart
-            call pymode#Execute("ropevim._interface._find_start()")
+            Python ropevim._interface._find_start()
             return g:pymode_offset
         else
             call RopeOmniComplete()

ftplugin/python/pymode.vim

@@ -1,6 +1,6 @@
 runtime ftplugin/python/init-pymode.vim
 
-if pymode#Default('g:pymode', 1) || !g:pymode
+if !g:pymode
     finish
 endif
 
@@ -76,7 +76,7 @@ if pymode#Option('lint')
     " DESC: Run queue
     let &l:updatetime = g:pymode_updatetime
     au CursorHold <buffer> call pymode#queue#Poll()
-    au BufLeave <buffer> call pymode#Execute("queue.stop_queue()")
+    au BufLeave <buffer> Python queue.stop_queue()
 
 endif