From: Fabián Ezequiel Gallina <fgallina@gnu.org>
Date: Mon, 28 Jan 2013 21:59:42 +0000 (-0300)
Subject: * progmodes/python.el (python-shell-parse-command): Find
X-Git-Tag: emacs-24.2.93~27
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e44970863d763264189e7ab98d6991a38dc95dc9;p=emacs.git

* progmodes/python.el (python-shell-parse-command): Find
python-shell-interpreter with modified environment.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa4a85c1ca7..26ad7ec799a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-28  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+	* progmodes/python.el (python-shell-parse-command): Find
+	python-shell-interpreter with modified environment.
+
 2013-01-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/cl.el (cl-set-getf): Add compatibility alias.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index c321714e2f1..71c5ba57fa0 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1654,7 +1654,11 @@ uniqueness for different types of configurations."
 
 (defun python-shell-parse-command ()
   "Calculate the string used to execute the inferior Python process."
-  (format "%s %s" python-shell-interpreter python-shell-interpreter-args))
+  (let ((process-environment (python-shell-calculate-process-environment))
+        (exec-path (python-shell-calculate-exec-path)))
+    (format "%s %s"
+            (executable-find python-shell-interpreter)
+            python-shell-interpreter-args)))
 
 (defun python-shell-calculate-process-environment ()
   "Calculate process environment given `python-shell-virtualenv-path'."