python.el: Fix local/remote shell environment setup

* lisp/progmodes/python.el (python-shell-with-environment): Fix
remote/local environment setup.

* test/automated/python-tests.el (python-shell-with-environment-1)
(python-shell-with-environment-2): New tests.

1 files changed, 18 insertions, 17 deletions

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 1c0f105ceaa..95814fabca3 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2060,23 +2060,24 @@ execution of body.  If `default-directory' points to a remote
 machine then modifies `tramp-remote-process-environment' and
 `tramp-remote-path' instead."
   (declare (indent 0) (debug (body)))
-  (let ((remote-p (file-remote-p default-directory)))
-    `(let ((process-environment
-            (if ,remote-p
-                process-environment
-              (python-shell-calculate-process-environment)))
-           (tramp-remote-process-environment
-            (if ,remote-p
-                (python-shell-calculate-process-environment)
-              tramp-remote-process-environment))
-           (exec-path
-            (if ,remote-p
-                (python-shell-calculate-exec-path)
-              exec-path))
-           (tramp-remote-path
-            (if ,remote-p
-                (python-shell-calculate-exec-path)
-              tramp-remote-path)))
+  (let ((remote-p (make-symbol "remote-p")))
+    `(let* ((,remote-p (file-remote-p default-directory))
+            (process-environment
+             (if ,remote-p
+                 process-environment
+               (python-shell-calculate-process-environment)))
+            (tramp-remote-process-environment
+             (if ,remote-p
+                 (python-shell-calculate-process-environment)
+               tramp-remote-process-environment))
+            (exec-path
+             (if ,remote-p
+                 exec-path
+               (python-shell-calculate-exec-path)))
+            (tramp-remote-path
+             (if ,remote-p
+                 (python-shell-calculate-exec-path)
+               tramp-remote-path)))
        ,(macroexp-progn body))))
 
 (defvar python-shell--prompt-calculated-input-regexp nil