Remove checks for Python 2 from Vim script

avacariu · avacariu · commit 311de6710d0e · 2019-12-06T15:38:03.000-08:00
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -148,14 +148,14 @@ will appear, eg. `:botright`.
 2.1. Python version ~
                                                           *pymode-python-version*
 
-By default pymode looks for current python version supported in your Vim.
-You could choose prefer version, but value will be tested on loading.
+By default pymode will attempt to use Python 3, if available. However, you can
+also disable all Python features of pymode.
 
                                                               *'g:pymode_python'*
 >
-    let g:pymode_python = 'python'
+    let g:pymode_python = 'python3'
 
-Values are `python`, `python3`, `disable`. If value set to `disable` most
+Values are `python3`, `disable`. If value set to `disable` most
 python-features of **pymode** will be disabled.
 
 Set value to `python3` if you are working with python3 projects. You could use
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -232,7 +232,6 @@ if g:pymode_debug
         let g:pymode_debug_tempfile=matchstr(
             \ execute(
             \ g:pymode_python
-            \ . " from __future__ import print_function;"
             \ . " import os;import tempfile; marker='|';"
             \ . " print(marker, tempfile.gettempdir(), os.sep, "
             \ .        "'pymode_debug_file.txt', marker, sep='', end='')"),
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -22,7 +22,7 @@ filetype plugin on
 if has("python3") && executable('python3')
     call pymode#default('g:pymode_python', 'python3')
 else
-    call pymode#default('g:pymode_python', 'python')
+    call pymode#default('g:pymode_python', 'disable')
 endif
 
 " Disable pymode warnings
@@ -286,25 +286,14 @@ filetype plugin on
 
 " 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")
+    if (exists('g:_uspy') && g:_uspy == ':py3') || 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'
+if g:pymode_python == 'python3'
 
     command! -nargs=1 PymodePython python3 <args>
     let g:UltiSnipsUsePythonVersion = 3
diff --git a/readme.md b/readme.md
@@ -183,12 +183,7 @@ Read this section before opening an issue on the tracker.
 
 ## Python 3 syntax
 
-By default python-mode uses python 2 syntax checking. To enable python 3 syntax
-checking (e.g. for async) add:
-
-    let g:pymode_python = 'python3'
-
-To your vimrc or exrc file.
+By default python-mode uses python 3 syntax checking.
 
 ## Symlinks on Windows
 
