From cfa2783e03152871c0d703a6f79e96254dbe6c44 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Wed, 11 Mar 2015 14:17:09 -0400 Subject: [PATCH] ob-python.el: Strip leading session characters * lisp/ob-python.el (org-babel-python-evaluate-session): Strip leading "..." and ">>>" from session output. (org-babel-python-strip-session-chars): New function. --- lisp/ob-python.el | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/lisp/ob-python.el b/lisp/ob-python.el index dd3cc66..0267f22 100644 --- a/lisp/ob-python.el +++ b/lisp/ob-python.el @@ -306,16 +306,17 @@ (defun org-babel-python-evaluate-session (results (case result-type (output - (mapconcat - #'org-babel-trim - (butlast - (org-babel-comint-with-output - (session org-babel-python-eoe-indicator t body) - (funcall input-body body) - (funcall send-wait) (funcall send-wait) - (insert org-babel-python-eoe-indicator) - (funcall send-wait)) - 2) "\n")) + (org-babel-python-strip-session-chars + (mapconcat + #'org-babel-chomp + (butlast + (org-babel-comint-with-output + (session org-babel-python-eoe-indicator t body) + (funcall input-body body) + (funcall send-wait) (funcall send-wait) + (insert org-babel-python-eoe-indicator) + (funcall send-wait)) + 2) "\n"))) (value (let ((tmp-file (org-babel-temp-file "python-"))) (org-babel-comint-with-output @@ -339,6 +340,15 @@ (defun org-babel-python-read-string (string) (match-string 1 string) string)) +(defun org-babel-python-strip-session-chars (string) + "Remove leading >>> and ... from Python session output." + (with-temp-buffer + (insert string) + (goto-char (point-min)) + (when (looking-at "\\s-*\\(\\(>>> \\)*\\(\\.\\.\\. \\)*\\)") + (delete-region (match-beginning 1) (match-end 1))) + (buffer-string))) + (provide 'ob-python) -- 2.3.2