diff --git a/lisp/ob-python.el b/lisp/ob-python.el index 0e0539d7a..c15d45b96 100644 --- a/lisp/ob-python.el +++ b/lisp/ob-python.el @@ -400,28 +400,31 @@ by `org-babel-comint-async-filter'." session (current-buffer) "ob_comint_async_python_\\(.+\\)_\\(.+\\)" 'org-babel-chomp 'org-babel-python-async-value-callback) - (let ((python-shell-buffer-name (org-babel-python-without-earmuffs session))) - (pcase result-type - (`output - (let ((uuid (org-id-uuid))) - (with-temp-buffer - (insert (format org-babel-python-async-indicator "start" uuid)) - (insert "\n") - (insert body) - (insert "\n") - (insert (format org-babel-python-async-indicator "end" uuid)) - (python-shell-send-buffer)) - uuid)) - (`value - (let ((tmp-results-file (org-babel-temp-file "python-")) - (tmp-src-file (org-babel-temp-file "python-"))) - (with-temp-file tmp-src-file (insert body)) - (with-temp-buffer - (insert (org-babel-python-format-session-value tmp-src-file tmp-results-file result-params)) - (insert "\n") - (insert (format org-babel-python-async-indicator "file" tmp-results-file)) - (python-shell-send-buffer)) - tmp-results-file))))) + (pcase result-type + (`output + (let ((uuid (org-id-uuid))) + (with-temp-buffer + (insert (format org-babel-python-async-indicator "start" uuid)) + (insert "\n") + (insert body) + (insert "\n") + (insert (format org-babel-python-async-indicator "end" uuid)) + (let ((python-shell-buffer-name + (org-babel-python-without-earmuffs session))) + (python-shell-send-buffer))) + uuid)) + (`value + (let ((tmp-results-file (org-babel-temp-file "python-")) + (tmp-src-file (org-babel-temp-file "python-"))) + (with-temp-file tmp-src-file (insert body)) + (with-temp-buffer + (insert (org-babel-python-format-session-value tmp-src-file tmp-results-file result-params)) + (insert "\n") + (insert (format org-babel-python-async-indicator "file" tmp-results-file)) + (let ((python-shell-buffer-name + (org-babel-python-without-earmuffs session))) + (python-shell-send-buffer))) + tmp-results-file)))) (provide 'ob-python) diff --git a/testing/lisp/test-ob-python.el b/testing/lisp/test-ob-python.el index 7aac87116..82fbca36e 100644 --- a/testing/lisp/test-ob-python.el +++ b/testing/lisp/test-ob-python.el @@ -296,6 +296,20 @@ print(list(range(3))) (string= (concat src-block result) (buffer-string))))))) +(ert-deftest test-ob-python/async-local-python-shell () + ;; Disable the test on older Emacs as built-in python.el sometimes + ;; fail to initialize session. + (skip-unless (version<= "28" emacs-version)) + (when-let ((buf (get-buffer "*Python*"))) + (let (kill-buffer-query-functions) + (kill-buffer buf))) + (org-test-with-temp-text-in-file + "# -*- python-shell-buffer-name: \"Python 3\" -*- +#+begin_src python :session \"*Python 3*\" :async yes +1 +#+end_src" + (should (org-babel-execute-src-block)))) + (provide 'test-ob-python) ;;; test-ob-python.el ends here