python-mode
diff --git a/‎plugin/pymode.vim
Lines changed: 27 additions & 7 deletions b/‎plugin/pymode.vim
Lines changed: 27 additions & 7 deletions
@@ -19,7 +19,7 @@ filetype plugin on
 " OPTIONS: {{{
 
 " Vim Python interpreter. Set to 'disable' for remove python features.
-call pymode#default('g:pymode_python', 'python')
+call pymode#default('g:pymode_python', '')
 
 " Disable pymode warnings
 call pymode#default('g:pymode_warning', 1)
@@ -247,26 +247,46 @@ endif
 " Disable python-related functionality
 " let g:pymode_python = 'disable'
 " let g:pymode_python = 'python3'
-if g:pymode_python != 'disable' && (g:pymode_python == 'python3' || !has('python') && has('python3'))
-    let g:pymode_python = 'python3'
-    command! -nargs=1 PymodePython python3 <args>
 
-elseif g:pymode_python != 'disable' && has('python')
-    let g:pymode_python = 'python'
+" UltiSnips Fixes
+if !len(g:pymode_python)
+    if exists('g:_uspy') && g:_uspy == ':py'
+        let g:pymode_python = 'python'
+    elseif exists('g:_uspy') && g:_uspy == ':py3'
+        let g:pymode_python = 'python3'
+    elseif has("python")
+        let g:pymode_python = 'python'
+    elseif has("python3")
+        let g:pymode_python = 'python3'
+    else
+        let g:pymode_python = 'disable'
+    endif
+endif
+
+if g:pymode_python == 'python'
+
     command! -nargs=1 PymodePython python <args>
+    let g:UltiSnipsUsePythonVersion = 2
+
+elseif g:pymode_python == 'python3'
+
+    command! -nargs=1 PymodePython python3 <args>
+    let g:UltiSnipsUsePythonVersion = 3
 
 else
 
     let g:pymode_doc = 0
     let g:pymode_lint = 0
     let g:pymode_path = 0
-    let g:pymode_python = 'disable'
     let g:pymode_rope = 0
     let g:pymode_run = 0
     let g:pymode_virtualenv = 0
 
+    command! -nargs=1 PymodePython echo <args>
+
 endif
 
+
 command! PymodeVersion echomsg "Pymode version: " . g:pymode_version . " interpreter: " . g:pymode_python . " lint: " . g:pymode_lint . " rope: " . g:pymode_rope
 
 augroup pymode