Make 'python-shell--with-environment' respect buffer-local vars

* lisp/progmodes/python.el (python-shell--with-environment):
Make `with-temp-buffer' respect buffer-local values of
`process-environment' and `exec-path', if set.  (Bug#72849)

(cherry picked from commit 5fd75133cfe389004f9fca8f11e093e531c45fe2)

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 6914a663af0bff2beb5bacba17afe466f2892ec2..00521eace047cefdd05834b89337a1ac52fab921 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3030,11 +3030,11 @@ machine then modifies `tramp-remote-process-environment' and
                  (tramp-dissect-file-name default-directory 'noexpand)))))
     (if vec
         (python-shell--tramp-with-environment vec extraenv bodyfun)
-      (let ((process-environment
-             (append extraenv process-environment))
-            (exec-path
-             ;; FIXME: This is still Python-specific.
-             (python-shell-calculate-exec-path)))
+      (cl-letf (((default-value 'process-environment)
+                (append extraenv process-environment))
+               ((default-value 'exec-path)
+                ;; FIXME: This is still Python-specific.
+                (python-shell-calculate-exec-path)))
         (funcall bodyfun)))))
 
 (defun python-shell--tramp-with-environment (vec extraenv bodyfun)