* python.el (python-shell-send-file): Add option to delete file when done.

(python-shell-send-string, python-shell-send-region): Use it.

Fixes: debbugs:15647

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ede723e6d6b44e89ee7171f46d6154873aa60e67..8b67c3ede81d6903e4d6356f63db8092b1c4bb9f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-23  Glenn Morris  <rgm@gnu.org>
+
+       * progmodes/python.el (python-shell-send-file):
+       Add option to delete file when done.  (Bug#15647)
+       (python-shell-send-string, python-shell-send-region): Use it.
+
 2013-11-23  Ivan Shmakov  <ivan@siamics.net>  (tiny change)
 
        * vc/diff-mode.el (diff-mode): Only allow diff-default-read-only

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 7a90f0bb5ee0cf7cc0380eded04c2e4d1987125b..8dc345ca1c1f30b3b9a446d2d37be455c66b79fc 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2056,7 +2056,7 @@ When MSG is non-nil messages the first line of STRING."
   (let ((process (or process (python-shell-get-or-create-process))))
     (if (string-match ".\n+." string)   ;Multiline.
         (let* ((temp-file-name (python-shell--save-temp-file string)))
-          (python-shell-send-file temp-file-name process temp-file-name))
+          (python-shell-send-file temp-file-name process temp-file-name t))
       (comint-send-string process string)
       (when (or (not (string-match "\n\\'" string))
                 (string-match "\n[ \t].*\n?\\'" string))
@@ -2212,7 +2212,7 @@ the python shell:
     (message "Sent: %s..." (match-string 1 string))
     (let* ((temp-file-name (python-shell--save-temp-file string))
            (file-name (or (buffer-file-name) temp-file-name)))
-      (python-shell-send-file file-name process temp-file-name)
+      (python-shell-send-file file-name process temp-file-name t)
       (unless python--use-fake-loc
         (with-current-buffer (process-buffer process)
           (compilation-fake-loc (copy-marker start) temp-file-name
@@ -2249,11 +2249,12 @@ When argument ARG is non-nil do not include decorators."
            (end-of-line 1))
        (point-marker)))))
 
-(defun python-shell-send-file (file-name &optional process temp-file-name)
+(defun python-shell-send-file (file-name &optional process temp-file-name
+                                         delete)
   "Send FILE-NAME to inferior Python PROCESS.
 If TEMP-FILE-NAME is passed then that file is used for processing
 instead, while internally the shell will continue to use
-FILE-NAME."
+FILE-NAME.  If DELETE is non-nil, delete the file afterwards."
   (interactive "fFile to send: ")
   (let* ((process (or process (python-shell-get-or-create-process)))
          (temp-file-name (when temp-file-name
@@ -2271,8 +2272,11 @@ FILE-NAME."
      (format
       (concat "__pyfile = open('''%s''');"
               "exec(compile(__pyfile.read(), '''%s''', 'exec'));"
-              "__pyfile.close()")
-      (or temp-file-name file-name) file-name)
+              "__pyfile.close()%s")
+      (or temp-file-name file-name) file-name
+      (if delete (format "; import os; os.remove('''%s''')"
+                         (or temp-file-name file-name))
+        ""))
      process)))
 
 (defun python-shell-switch-to-shell ()