Merge pull request #1941 from eanopolsky/master

fixes #1940, tests
jorgenschaefer · Dec 10, 2021 · 0481f87 · 0481f87
2 parents d4e47a1 + 0a308b4
commit 0481f87
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/elpy-rpc.el b/elpy-rpc.el
@@ -71,7 +71,11 @@ this to prevent this from happening."
                                        (or (executable-find "py")
                                            (executable-find "pythonw")
                                            "python")
-                                     "python")
+                                     (if (executable-find "python")
+					 "python"
+				       ;; Fallback on systems where python is not
+				       ;; symlinked to python3.
+				       "python3"))
   "The Python interpreter for the RPC backend.
 
 This should NOT be an interactive shell like ipython or jupyter.

diff --git a/scripts/setup b/scripts/setup
@@ -15,7 +15,7 @@ pip install -r requirements.txt --upgrade
 pip install -r requirements-rpc.txt --upgrade
 pip install -r requirements-dev.txt --upgrade
 # For python2
-if python -c 'import sys ; exit(sys.version_info < (3, 0))'
+if python -c 'import sys ; exit(not sys.version_info < (3, 0))'
 then
     pip install -r requirements-dev2.txt --upgrade
 fi