From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id gDZyCZi7J2cVAAAAqHPOHw:P1 (envelope-from ) for ; Sun, 03 Nov 2024 18:06:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id gDZyCZi7J2cVAAAAqHPOHw (envelope-from ) for ; Sun, 03 Nov 2024 19:06:16 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=UGPygqfO; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1730657175; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=M3/xXVu3Nhielo/XiG5Jaui6zcX8qAZ6xt1Nf9fYGKI=; b=FMEb6mWjmUPVt9PKo6JAzsV7djaD3E9OCq2oS1ERD4FkkOOWCEAEWn5BOCZbFdCoWZjdwq tl9MOpsAcmHN9x6IZHYwRA8t9oYCxDkZuBBeQUjhKTh6+j0oxxM20FESKCLPa2ImE2cbvO zlAbvSEWG7n9a+AAM00Dn/JmmUWFsn1VaS+nUHb0IsrLLfK+Shh7ruiZWmCGr6FzkEboRa lnQZhyLXmChTwIGolDZzS7rIYCpcZ4szwrE0dgcsXYr+haP1HfFJHgmN+XFKaRCn3EZY7v fjnnRMJwSMetfZPRlbE7Mk0wDxap5O7TFQPLHIGZ0TswGO0/e0Bunj4tKZOr9w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1730657175; a=rsa-sha256; cv=none; b=pwbJi/sY+qsXTyGWBtAbkBF75nEF2cKiD7mmS3J1OGqo7NePAJArqkVcDsrCfjSp7s9Xfi HsjpdWQByu9SN2BmZdu9AehTfm3iIldOY5Q10xvrYnFv3JXKIFSD9sYZjg+9Kf+HbTH2QF JlgT2X8dXerrXc/OiAvgxlmIQhdkPOu4PGOrY1W6us/vXacOf0sugDVbmRStQK8ml71qua d5RfgiJZusIdOwxuKQ9HAvT9rpSsmv1rQGk0p8oJBJgY6pdgQ82KlVD0QW05xI6RDTJpAw XI8OANYevpVdIErIFf+htX0uWD8rrKFrrxJbjtI9rkP1LRIde247SdRsxDmDiw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=UGPygqfO; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gmail.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 750A57A5C6 for ; Sun, 03 Nov 2024 19:06:15 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t7eyy-0003Df-Uj; Sun, 03 Nov 2024 13:05:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t7eyw-0003DO-A3 for emacs-orgmode@gnu.org; Sun, 03 Nov 2024 13:05:46 -0500 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t7eyt-0004jZ-LC for emacs-orgmode@gnu.org; Sun, 03 Nov 2024 13:05:46 -0500 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-720be27db74so2158737b3a.1 for ; Sun, 03 Nov 2024 10:05:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730657141; x=1731261941; darn=gnu.org; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=M3/xXVu3Nhielo/XiG5Jaui6zcX8qAZ6xt1Nf9fYGKI=; b=UGPygqfOdiYa0uYA4GY4yAlQJq3QHwDuO19z5gI3LvYizNmH0qDGWakLZP7lzFouju vRQ5sZ9HIssaACpmm7amuy9Ow9e8IPvsxVZHr1827jhK+U+83FtD5esqIYyI+gCMQxyv FI/56y1LCT43gOUNrDPpiVtl9KPopfmSDW1R54YUKTW9LrytDOMYTqrhNZT//FbIq2hO 2nEGavcna9miQSRCHKBCtD2n06tKeo+PW1ZAE6W8f/0GPPx0TBEEr3CIPyTe8efyoh8L AdmIk/eDt5h8zAqIu3MEHp+Dzhu0zXzcZ/sK9BXDzRcky32Jcj0VE/DYF3uIcdIOnR3q f07w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730657141; x=1731261941; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=M3/xXVu3Nhielo/XiG5Jaui6zcX8qAZ6xt1Nf9fYGKI=; b=UGxGRscaoPgc4ge0RLcGVSu3NUZQokDMZT6VSOVzR6gke/dtZXM3S57amIBiyzQlVq e6ePb4FyWKMgdo0rVvTxf2H3SqUWeOIdDoI2SjV0Oi+wMaMEeNdMUvlrFPDHR4OAWcKD qH0LeSSg1pDKBrGDaSMPLIKj/Z0510H6iEu853Jg2Hgj1sN9n8F0qXz8fq20vOL19VxF EGJaiVoPgTl4JuIT0huz24D2fSxn3JKK1FtfTaDeAQPBc/NNgLX9tRTZDduGrz776U6W gxt0rWkTNJ+krGdT7+5LDkFkrs3J3INL2xtTTiwL5iuRFwG7dLOKQW3JlCbsoeyygtld knDw== X-Gm-Message-State: AOJu0YzD2EiCZ/SRs5L/OBfdFVmyxHZnRem3Va+Sz2PWVc0Zjsgn3rpi WA9LCh4y4cz0d9sCHDC1/0xJY1VafiEBOXyDkJcvS+Q964OLZfbO3gQtnw== X-Google-Smtp-Source: AGHT+IGcuAZEU3OVWVmEb5NpvR+RQ/u8YvT74elnrBgLGRWkAVp6k6zDEoTfjXZoTdwClBqhk+n7qg== X-Received: by 2002:a05:6a20:49a7:b0:1d9:3acf:8bdd with SMTP id adf61e73a8af0-1db950872b0mr16316233637.22.1730657141126; Sun, 03 Nov 2024 10:05:41 -0800 (PST) Received: from localhost ([198.27.183.102]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-720bc1e5839sm5936970b3a.68.2024.11.03.10.05.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2024 10:05:40 -0800 (PST) From: Jack Kamm To: Ihor Radchenko Cc: emacs-orgmode@gnu.org, jeremiejuste@gmail.com Subject: Re: [PATCH] ob-comint,R,python: Options for more robust non-async session output In-Reply-To: <87jzdyvikn.fsf@localhost> References: <87h6993y6q.fsf@gmail.com> <87v7xowod1.fsf@localhost> <878qui3t7b.fsf@gmail.com> <87jzdyvikn.fsf@localhost> Date: Sun, 03 Nov 2024 10:05:39 -0800 Message-ID: <877c9k19cc.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=jackkamm@gmail.com; helo=mail-pf1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.72 X-Spam-Score: -4.72 X-Migadu-Queue-Id: 750A57A5C6 X-Migadu-Scanner: mx13.migadu.com X-TUID: 6SPJlDblDjC1 --=-=-= Content-Type: text/plain Ihor Radchenko writes: > Thanks! > I think that we need to do the same things as with your > `org-babel-comint-async-register' patch: (1) ORG-NEWS; (2) possibly use > more descriptive values. I'm attaching an updated patch with NEWS entry and more descriptive values for the prompt handling, consistent with the `org-babel-comint-async-register' patch. For the NEWS entry, I actually just modified the previous NEWS entry for `org-babel-comint-async-register' since there is so much overlap. But let me know if it would be better to have a separate NEWS entry for each. >> - ;; Filter out prompts. >> - (org-babel-comint--prompt-filter string-buffer))))) >> + (if ,no-cleanup-prompt >> + (save-match-data >> + (string-match (regexp-quote ,eoe-indicator) string-buffer) >> + (org-babel-chomp (substring string-buffer 0 (match-beginning 0)))) >> + (org-babel-comint--prompt-filter string-buffer)))))) > > May you please explain this additional filtering of eoe-indicator here? > Why did it become necessary and why you did not change anything when > NO-CLEANUP-PROMPT is nil - `org-babel-comint--prompt-filter' does > nothing about eoe-endicator. Indeed `org-babel-comint--prompt-filter' does nothing about eoe-indicator, leaving it to the language-specific processing (e.g. in org-babel-execute:) to clean it (e.g. with `butlast'). Since it can be confusing to have 2 different behaviors, I've updated the `disable-prompt-filtering' case to be more consistent, and leave the cleaning of the eoe-indicator to the language-specific implementations in ob-python and ob-R. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Add-options-to-skip-extra-processing-in-org-babel-co.patch >From b96c5b9db5696e2e73c20d8f2ee056c0efa52580 Mon Sep 17 00:00:00 2001 From: Jack Kamm Date: Thu, 17 Oct 2024 17:33:47 -0700 Subject: [PATCH] Add options to skip extra processing in org-babel-comint-with-output This patch adds options to org-babel-comint-with-output to skip prompt removal. Allowing individual languages to handle this cleanup can be more robust than relying on the generic ob-comint implementation. This allows ob-python to switch back to using `org-babel-comint-with-output' rather than its own bespoke reimplementation, reducing code duplication. Furthermore, this adds a new implementation of ob-R non-async session output evaluation, that is similar to the ob-python approach in that it avoids leaking prompts, rather than relying on the cleanup from `org-babel-comint-with-output'. A test is added to test-ob-R.el to demonstrate the improved robustness of the new approach; previously, this test would fail due to a false positive prompt, but now passes. * lisp/ob-comint.el (org-babel-comint--remove-prompts-p): New helper function to parse the prompt-handling argument in `org-babel-comint-with-output' and `org-babel-comint-async-register'. (org-babel-comint-with-output): Add a new argument to prevent extra processing for prompt cleanup. Also, search for the end-of-execution sentinel within the collected output rather than the comint buffer, which doesn't depend on the position of point during evaluation. (org-babel-comint-async-register): Move parsing of prompt-handling argument to `org-babel-comint--remove-prompts-p'. * lisp/ob-python.el: Require subr-x for Emacs 27 compatibility. (org-babel-python-send-string): Switch to using `org-babel-comint-with-output', rather than bespoke reimplementation. * lisp/ob-R.el: Require subr-x for Emacs 27 compatibility. (ess-send-string): Declare external function. (org-babel-R-evaluate-session): New implementation of output evaluation that avoids leaking prompts, by writing the code block to a tmp file and then sourcing it. * testing/lisp/test-ob-R.el (test-ob-r/session-output-with->-bol): New test for robustness against false positive prompts at the beginning of a line. --- etc/ORG-NEWS | 12 ++++---- lisp/ob-R.el | 38 +++++++++++------------ lisp/ob-comint.el | 65 +++++++++++++++++++++++---------------- lisp/ob-python.el | 31 ++++++++----------- testing/lisp/test-ob-R.el | 12 ++++++++ 5 files changed, 87 insertions(+), 71 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index de4f11b25..92bfe3501 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -186,13 +186,13 @@ accept the INFO channel and return a string. This makes it possible to dynamically generate the content of the resulting ~~ tag in the resulting HTML document. -*** ~org-babel-comint-async-register~: New optional argument controlling prompt handling +*** ob-comint: New optional arguments controlling prompt handling -The new argument ~prompt-handling~ allows Babel languages to specify -how prompts should be handled when passing output to -~org-babel-comint-async-chunk-callback~. If equal to -~filter-prompts~, prompts are removed beforehand, same as the -default behavior of ~org-babel-comint-with-output~. If equal to +The new argument ~prompt-handling~ in ~org-babel-comint-with-output~ +and ~org-babel-comint-async-register~ allows Babel languages to +specify how prompts should be handled in comint output. If equal to +~filter-prompts~, prompts are removed from output before it is passed +on to language-specific processing. If equal to ~disable-prompt-filtering~, then the prompt filtering is skipped. If unset, then the default behavior is the same as ~filter-prompts~ for backwards compatibility. diff --git a/lisp/ob-R.el b/lisp/ob-R.el index 3214bf72c..1dbbd83f2 100644 --- a/lisp/ob-R.el +++ b/lisp/ob-R.el @@ -35,6 +35,8 @@ (org-assert-version) (require 'cl-lib) (require 'ob) +(require 'subr-x) ; For `string-trim-right', Emacs < 28 + (declare-function orgtbl-to-tsv "org-table" (table params)) (declare-function run-ess-r "ext:ess-r-mode" (&optional start-args)) (declare-function inferior-ess-send-input "ext:ess-inf" ()) @@ -42,6 +44,8 @@ (declare-function ess-make-buffer-current "ext:ess-inf" ()) (declare-function ess-eval-buffer "ext:ess-inf" (vis)) (declare-function ess-wait-for-process "ext:ess-inf" (&optional proc sec-prompt wait force-redisplay)) +(declare-function ess-send-string "ext:ess-inf" + (process string &optional visibly message type)) (defvar ess-current-process-name) ; ess-custom.el (defvar ess-local-process-name) ; ess-custom.el @@ -448,26 +452,20 @@ (defun org-babel-R-evaluate-session (org-babel-import-elisp-from-file tmp-file '(16))) column-names-p))) (output - (mapconcat - 'org-babel-chomp - (butlast - (delq nil - (mapcar - (lambda (line) (when (> (length line) 0) line)) - (mapcar - (lambda (line) ;; cleanup extra prompts left in output - (if (string-match - "^\\([>+.]\\([ ][>.+]\\)*[ ]\\)" - (car (split-string line "\n"))) - (substring line (match-end 1)) - line)) - (with-current-buffer session - (let ((comint-prompt-regexp (concat "^" comint-prompt-regexp))) - (org-babel-comint-with-output (session org-babel-R-eoe-output) - (insert (mapconcat 'org-babel-chomp - (list body org-babel-R-eoe-indicator) - "\n")) - (inferior-ess-send-input)))))))) "\n")))) + (let ((tmp-src-file (org-babel-temp-file "R-"))) + (with-temp-file tmp-src-file + (insert (concat + (org-babel-chomp body) "\n" org-babel-R-eoe-indicator))) + (with-current-buffer session + (org-babel-chomp + (string-trim-right + (org-babel-comint-with-output + (session org-babel-R-eoe-output nil nil 'disable-prompt-filtering) + (ess-send-string (get-buffer-process (current-buffer)) + (format "source('%s', echo=F, print.eval=T)" + (org-babel-process-file-name + tmp-src-file 'noquote)))) + (rx (literal org-babel-R-eoe-output) (zero-or-more anychar))))))))) (defun org-babel-R-process-value-result (result column-names-p) "R-specific processing of return value. diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el index 65f18fa80..2128b9638 100644 --- a/lisp/ob-comint.el +++ b/lisp/ob-comint.el @@ -101,15 +101,33 @@ (defun org-babel-comint--echo-filter (string &optional echo) (setq string (substring string (match-end 0)))) string) +(defun org-babel-comint--remove-prompts-p (prompt-handling) + "Helper to decide whether to remove prompts from comint output. +Parses the symbol in PROMPT-HANDLING, which can be +`filter-prompts', in which case prompts should be removed; or +`disable-prompt-filtering', in which case prompt filtering is +skipped. For backward-compatibility, the default value of `nil' +is equivalent to `filter-prompts'." + (cond + ((eq prompt-handling 'disable-prompt-filtering) nil) + ((eq prompt-handling 'filter-prompts) t) + ((eq prompt-handling nil) t) + (t (error (format "Unrecognized prompt handling behavior %s" + prompt-handling))))) + (defmacro org-babel-comint-with-output (meta &rest body) "Evaluate BODY in BUFFER and return process output. Will wait until EOE-INDICATOR appears in the output, then return all process output. If REMOVE-ECHO and FULL-BODY are present and -non-nil, then strip echo'd body from the returned output. META -should be a list containing the following where the last two -elements are optional. +non-nil, then strip echo'd body from the returned output. +PROMPT-HANDLING may be either of the symbols `filter-prompts', in +which case the output is split by `comint-prompt-regexp' and +returned as a list; or, `disable-prompt-filtering', which +suppresses this behavior and returns the full output as a string. +META should be a list containing the following where the last +three elements are optional. - (BUFFER EOE-INDICATOR REMOVE-ECHO FULL-BODY) + (BUFFER EOE-INDICATOR REMOVE-ECHO FULL-BODY PROMPT-HANDLING) This macro ensures that the filter is removed in case of an error or user `keyboard-quit' during execution of body." @@ -117,7 +135,8 @@ (defmacro org-babel-comint-with-output (meta &rest body) (let ((buffer (nth 0 meta)) (eoe-indicator (nth 1 meta)) (remove-echo (nth 2 meta)) - (full-body (nth 3 meta))) + (full-body (nth 3 meta)) + (prompt-handling (nth 4 meta))) `(org-babel-comint-in-buffer ,buffer (let* ((string-buffer "") (comint-output-filter-functions @@ -125,7 +144,7 @@ (defmacro org-babel-comint-with-output (meta &rest body) (setq string-buffer (concat string-buffer text))) comint-output-filter-functions)) dangling-text) - ;; got located, and save dangling text + ;; got located, and save dangling text (goto-char (process-mark (get-buffer-process (current-buffer)))) (let ((start (point)) (end (point-max))) @@ -135,13 +154,11 @@ (defmacro org-babel-comint-with-output (meta &rest body) ,@body ;; wait for end-of-evaluation indicator (let ((start-time (current-time))) - (while (progn - (goto-char comint-last-input-end) - (not (save-excursion - (and (re-search-forward - (regexp-quote ,eoe-indicator) nil t) - (re-search-forward - comint-prompt-regexp nil t))))) + (while (not (save-excursion + (and (string-match + (regexp-quote ,eoe-indicator) string-buffer) + (string-match + comint-prompt-regexp string-buffer)))) (accept-process-output (get-buffer-process (current-buffer)) org-babel-comint-fallback-regexp-threshold) @@ -152,21 +169,22 @@ (defmacro org-babel-comint-with-output (meta &rest body) (goto-char comint-last-input-end) (save-excursion (and - (re-search-forward - (regexp-quote ,eoe-indicator) nil t) - (re-search-forward - org-babel-comint-prompt-regexp-fallback nil t))))) + (string-match + (regexp-quote ,eoe-indicator) string-buffer) + (string-match + org-babel-comint-prompt-regexp-fallback string-buffer))))) (org-babel-comint--set-fallback-prompt)))) ;; replace cut dangling text - (goto-char (process-mark (get-buffer-process (current-buffer)))) + (goto-char (process-mark (get-buffer-process (current-buffer)))) (insert dangling-text) ;; remove echo'd FULL-BODY from input (and ,remove-echo ,full-body (setq string-buffer (org-babel-comint--echo-filter string-buffer ,full-body))) - ;; Filter out prompts. - (org-babel-comint--prompt-filter string-buffer))))) + (if (org-babel-comint--remove-prompts-p ,prompt-handling) + (org-babel-comint--prompt-filter string-buffer) + string-buffer))))) (defun org-babel-comint-input-command (buffer cmd) "Pass CMD to BUFFER. @@ -379,12 +397,7 @@ (defun org-babel-comint-async-register org-babel-comint-async-chunk-callback chunk-callback org-babel-comint-async-file-callback file-callback) (setq org-babel-comint-async-remove-prompts-p - (cond - ((eq prompt-handling 'disable-prompt-filtering) nil) - ((eq prompt-handling 'filter-prompts) t) - ((eq prompt-handling nil) t) - (t (error (format "Unrecognized prompt handling behavior %s" - prompt-handling))))) + (org-babel-comint--remove-prompts-p prompt-handling)) (unless (memq org-buffer org-babel-comint-async-buffers) (setq org-babel-comint-async-buffers (cons org-buffer org-babel-comint-async-buffers))) diff --git a/lisp/ob-python.el b/lisp/ob-python.el index 9975e83be..f21cf2e65 100644 --- a/lisp/ob-python.el +++ b/lisp/ob-python.el @@ -36,6 +36,8 @@ (require 'ob) (require 'org-macs) (require 'python) +(require 'subr-x) ; For `string-trim-right', Emacs < 28 + (defvar org-babel-tangle-lang-exts) (add-to-list 'org-babel-tangle-lang-exts '("python" . "py")) @@ -451,31 +453,22 @@ (defun org-babel-python-evaluate-external-process (defun org-babel-python-send-string (session body) "Pass BODY to the Python process in SESSION. Return output." - (with-current-buffer session - (let* ((string-buffer "") - (comint-output-filter-functions - (cons (lambda (text) (setq string-buffer - (concat string-buffer text))) - comint-output-filter-functions)) - (body (format "\ + (org-babel-chomp + (string-trim-right + (org-babel-comint-with-output + ((org-babel-session-buffer:python session) + org-babel-python-eoe-indicator + nil nil 'disable-prompt-filtering) + (python-shell-send-string (format "\ try: %s except: raise finally: print('%s')" - (org-babel-python--shift-right body 4) - org-babel-python-eoe-indicator))) - (let ((python-shell-buffer-name - (org-babel-python-without-earmuffs session))) - (python-shell-send-string body)) - ;; same as `python-shell-comint-end-of-output-p' in emacs-25.1+ - (while (not (and (python-shell-comint-end-of-output-p string-buffer) - (string-match - org-babel-python-eoe-indicator - string-buffer))) - (accept-process-output (get-buffer-process (current-buffer)))) - (org-babel-chomp (substring string-buffer 0 (match-beginning 0)))))) + (org-babel-python--shift-right body 4) + org-babel-python-eoe-indicator))) + (rx (literal org-babel-python-eoe-indicator) (zero-or-more anychar))))) (defun org-babel-python-evaluate-session (session body &optional result-type result-params graphics-file) diff --git a/testing/lisp/test-ob-R.el b/testing/lisp/test-ob-R.el index 2e171b2eb..cecdc7de8 100644 --- a/testing/lisp/test-ob-R.el +++ b/testing/lisp/test-ob-R.el @@ -126,6 +126,18 @@ (ert-deftest test-ob-r/output-with-<> () )))) +(ert-deftest test-ob-r/session-output-with->-bol () + "make sure prompt-like strings are well formatted, even when at beginning of line." + (let (ess-ask-for-ess-directory ess-history-file) + (should (string="abc +def>