comparison lisp/progmodes/python.el @ 55240:780b94f913fe

(python-send-command): New fun. (python-send-region, python-load-file): Use it.

55239:1af59a842b93

    print '_emacs_out', func.__name__+inspect.formatargspec (args, varargs, varkw, defaults)

print '_emacs_ok'"))
  (unless noshow (pop-to-buffer (setq python-buffer "*Python*"))))

(defun python-send-region (start end)
  "Send the region to the inferior Python process."
  ;; The region is evaluated from a temporary file.  This avoids
  ;; problems with blank lines, which have different semantics
  ;; interactively and in files.  It also saves the inferior process

	  (/= 0 (current-indentation)))	; need dummy block
	(write-region "if True:\n" nil f nil 'nomsg))
    (write-region start end f t 'nomsg)
    (when python-buffer
      (with-current-buffer python-buffer
	(let ((end (marker-position (process-mark (python-proc)))))
	  (set (make-local-variable 'python-orig-start) orig-start)
	  (set (make-local-variable 'compilation-error-list) nil)
	  (let ((comint-input-filter-functions
		 (delete 'python-input-filter comint-input-filter-functions)))
	    (python-send-string command))
	  (set-marker compilation-parsing-end end)
	  (setq compilation-last-buffer (current-buffer)))))))

(defun python-send-string (string)
  "Evaluate STRING in inferior Python process."
  (interactive "sPython command: ")
  (comint-send-string (python-proc) string)

  (comint-check-source file-name) ; Check to see if buffer needs saved.
  (setq python-prev-dir/file (cons (file-name-directory file-name)
				   (file-name-nondirectory file-name)))
  (when python-buffer
    (with-current-buffer python-buffer
      (let ((end (marker-position (process-mark (python-proc)))))
	(set (make-local-variable 'compilation-error-list) nil)
	;; (set (make-local-variable 'compilation-old-error-list) nil)
	(let ((comint-input-filter-functions
	       (delete 'python-input-filter comint-input-filter-functions)))
	  (set (make-local-variable 'python-orig-start) nil)
	  ;; Fixme: I'm not convinced by this logic from python-mode.el.
	  (python-send-string
	   (if (string-match "\\.py\\'" file-name)
	       ;; Fixme: make sure the directory is in the path list
	       (let ((module (file-name-sans-extension
			      (file-name-nondirectory file-name))))
		 (format "\
if globals().has_key(%S): reload(%s)
else: import %s
" module module module))
	     (format "execfile('%s')" file-name))))
	(set-marker compilation-parsing-end end)
	(setq compilation-last-buffer (current-buffer))))))

;; Fixme: Should this start a process if there isn't one?  (Unlike cmuscheme.)
(defun python-proc ()
  "Return the current Python process.  See variable `python-buffer'."
  (let ((proc (get-buffer-process (if (eq major-mode 'inferior-python-mode)

55240:780b94f913fe

    print '_emacs_out', func.__name__+inspect.formatargspec (args, varargs, varkw, defaults)

print '_emacs_ok'"))
  (unless noshow (pop-to-buffer (setq python-buffer "*Python*"))))

(defun python-send-command (command)
  "Like `python-send-string' but resets `compilation-minor-mode'."
  (let ((end (marker-position (process-mark (python-proc)))))
    (compilation-forget-errors)
    (python-send-string command)
    (set-marker compilation-parsing-end end)
    (setq compilation-last-buffer (current-buffer))))

(defun python-send-region (start end)
  "Send the region to the inferior Python process."
  ;; The region is evaluated from a temporary file.  This avoids
  ;; problems with blank lines, which have different semantics
  ;; interactively and in files.  It also saves the inferior process

	  (/= 0 (current-indentation)))	; need dummy block
	(write-region "if True:\n" nil f nil 'nomsg))
    (write-region start end f t 'nomsg)
    (when python-buffer
      (with-current-buffer python-buffer
	(set (make-local-variable 'python-orig-start) orig-start)
	(let ((comint-input-filter-functions
	       ;; Don't reset python-orig-start.
	       (remq 'python-input-filter comint-input-filter-functions)))
	  (python-send-command command))))))

(defun python-send-string (string)
  "Evaluate STRING in inferior Python process."
  (interactive "sPython command: ")
  (comint-send-string (python-proc) string)

  (comint-check-source file-name) ; Check to see if buffer needs saved.
  (setq python-prev-dir/file (cons (file-name-directory file-name)
				   (file-name-nondirectory file-name)))
  (when python-buffer
    (with-current-buffer python-buffer
      ;; Fixme: I'm not convinced by this logic from python-mode.el.
      (python-send-command
       (if (string-match "\\.py\\'" file-name)
	   ;; Fixme: make sure the directory is in the path list
	   (let ((module (file-name-sans-extension
			  (file-name-nondirectory file-name))))
	     (format "\
if globals().has_key(%S): reload(%s)
else: import %s
" module module module))
	 (format "execfile('%s')" file-name))))))

;; Fixme: Should this start a process if there isn't one?  (Unlike cmuscheme.)
(defun python-proc ()
  "Return the current Python process.  See variable `python-buffer'."
  (let ((proc (get-buffer-process (if (eq major-mode 'inferior-python-mode)