From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 14 Apr 2019 22:45:35 +0000 (-0400)
Subject: * lisp/progmodes/python.el: Be more careful about temp file removal
X-Git-Tag: emacs-26.2.90~102
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a608fc6f3ded3e615e7accb29f16bfd290d80a1;p=emacs.git

* lisp/progmodes/python.el: Be more careful about temp file removal

(python-shell-prompt-detect): Use unwind-protect to try and not leave
file behind in case of error.
---

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 27d31abaf5b..38dcc823d06 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2266,15 +2266,16 @@ detection and just returns nil."
                          ;; carriage returns in unbuffered mode.
                          (let ((inhibit-eol-conversion (getenv "PYTHONUNBUFFERED")))
                            (python-shell--save-temp-file code))))
-                    ;; Use `process-file' as it is remote-host friendly.
-                    (process-file
-                     interpreter
-                     code-file
-                     '(t nil)
-                     nil
-                     interpreter-arg)
-                    ;; Try to cleanup
-                    (delete-file code-file)))
+                    (unwind-protect
+                        ;; Use `process-file' as it is remote-host friendly.
+                        (process-file
+                         interpreter
+                         code-file
+                         '(t nil)
+                         nil
+                         interpreter-arg)
+                      ;; Try to cleanup
+                      (delete-file code-file))))
                 (buffer-string)))
              (prompts
               (catch 'prompts