[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#64397: 29.0.91; Limited configuration of commands based on python-in
From: |
Matthias Meulien |
Subject: |
bug#64397: 29.0.91; Limited configuration of commands based on python-interpreter |
Date: |
Mon, 17 Jul 2023 21:17:19 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
Eli Zaretskii <eliz@gnu.org> writes:
> Thanks. This is for master, right? Because it fails to apply, even
> without the NEWS entry (which are sometimes problematic). Could you
> please rebase on master and resubmit?
Yes, this is for master. Here is an updated patch generated from commit
bec707da4db.
>From 11a08b43ab581fe0b4c91a82a6344486793c7bbf Mon Sep 17 00:00:00 2001
From: Matthias Meulien <orontee@gmail.com>
Date: Thu, 13 Jul 2023 23:38:41 +0200
Subject: [PATCH] Custom var python-interpreter-args (bug#64397)
* lisp/progmodes/python.el (python-interpreter): Mention new variable
in documentation.
(python-interpreter-args): New custom variable.
(python-shell-interpreter, python-shell-interpreter-args)
(python-shell-interpreter-interactive-arg): Improve documentation.
(python--list-imports, python--do-isort, python-fix-imports): Make
process use customisable arguments.
---
etc/NEWS | 4 +++
lisp/progmodes/python.el | 59 ++++++++++++++++++++++++++++------------
2 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index 3cfc36e10da..bc596f5c03e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -411,6 +411,10 @@ instead of:
and another_expression):
do_something()
+*** New user option 'python-interpreter-args'.
+This allows the user to specify command line arguments to the non
+interactive Python interpreter specified by 'python-interpreter'.
+
** use-package
+++
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index a23339a2180..52e5a36f4b0 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -297,11 +297,18 @@ python
(defcustom python-interpreter "python"
"Python interpreter for noninteractive use.
-To customize the Python shell, modify `python-shell-interpreter'
-instead."
+Some Python interpreters also require changes to
+`python-interpreter-args'.
+
+To customize the Python interpreter for interactive use, modify
+`python-shell-interpreter' instead."
:version "29.1"
:type 'string)
+(defcustom python-interpreter-args ""
+ "Arguments for the Python interpreter for noninteractive use."
+ :version "30.1"
+ :type 'string)
;;; Bindings
@@ -2558,7 +2565,7 @@ python-shell-interpreter
(cond ((executable-find "python3") "python3")
((executable-find "python") "python")
(t "python3"))
- "Default Python interpreter for shell.
+ "Python interpreter for interactive use.
Some Python interpreters also require changes to
`python-shell-interpreter-args'. In particular, setting
@@ -2573,11 +2580,12 @@ python-shell-internal-buffer-name
:safe 'stringp)
(defcustom python-shell-interpreter-args "-i"
- "Default arguments for the Python interpreter."
+ "Arguments for the Python interpreter for interactive use."
:type 'string)
(defcustom python-shell-interpreter-interactive-arg "-i"
- "Interpreter argument to force it to run interactively."
+ "Interpreter argument to force it to run interactively.
+This is used only for prompt detection."
:type 'string
:version "24.4")
@@ -6505,18 +6513,25 @@ python--list-imports
(let* ((temp (current-buffer))
(status (if (bufferp source)
(with-current-buffer source
- (call-process-region (point-min) (point-max)
- python-interpreter
- nil (list temp nil) nil
- "-c" python--list-imports
- (or name "")))
+ (apply #'call-process-region
+ (point-min) (point-max)
+ python-interpreter
+ nil (list temp nil) nil
+ (append
+ (split-string-shell-command
+ python-interpreter-args)
+ `("-c" ,python--list-imports)
+ (list (or name "")))))
(with-current-buffer buffer
(apply #'call-process
python-interpreter
nil (list temp nil) nil
- "-c" python--list-imports
- (or name "")
- (mapcar #'file-local-name source)))))
+ (append
+ (split-string-shell-command
+ python-interpreter-args)
+ `("-c" ,python--list-imports)
+ (list (or name ""))
+ (mapcar #'file-local-name source))))))
lines)
(python--list-imports-check-status status)
(goto-char (point-min))
@@ -6559,7 +6574,11 @@ python--do-isort
(point-min) (point-max)
python-interpreter
nil (list temp nil) nil
- "-m" "isort" "-" args))
+ (append
+ (split-string-shell-command
+ python-interpreter-args)
+ '("-m" "isort" "-")
+ args)))
(tick (buffer-chars-modified-tick)))
(unless (eq 0 status)
(error "%s exited with status %s (maybe isort is missing?)"
@@ -6629,10 +6648,14 @@ python-fix-imports
(with-temp-buffer
(let ((temp (current-buffer)))
(with-current-buffer buffer
- (call-process-region (point-min) (point-max)
- python-interpreter
- nil temp nil
- "-m" "pyflakes"))
+ (apply #'call-process-region
+ (point-min) (point-max)
+ python-interpreter
+ nil temp nil
+ (append
+ (split-string-shell-command
+ python-interpreter-args)
+ '("-m" "pyflakes"))))
(goto-char (point-min))
(when (looking-at-p ".* No module named pyflakes$")
(error "%s couldn't find pyflakes" python-interpreter))
--
2.39.2
--
Matthias
- bug#64397: 29.0.91; Limited configuration of commands based on python-interpreter, (continued)
- bug#64397: 29.0.91; Limited configuration of commands based on python-interpreter, Augusto Stoffel, 2023/07/07
- bug#64397: 29.0.91; Limited configuration of commands based on python-interpreter, Matthias Meulien, 2023/07/06
- bug#64397: 29.0.91; Limited configuration of commands based on python-interpreter, Eli Zaretskii, 2023/07/08
- bug#64397: 29.0.91; Limited configuration of commands based on python-interpreter, kobarity, 2023/07/08
- bug#64397: 29.0.91; Limited configuration of commands based on python-interpreter, Eli Zaretskii, 2023/07/08
- bug#64397: 29.0.91; Limited configuration of commands based on python-interpreter, Matthias Meulien, 2023/07/08
- bug#64397: 29.0.91; Limited configuration of commands based on python-interpreter, kobarity, 2023/07/09
- bug#64397: 29.0.91; Limited configuration of commands based on python-interpreter, Eli Zaretskii, 2023/07/13
- bug#64397: 29.0.91; Limited configuration of commands based on python-interpreter, Matthias Meulien, 2023/07/13
- bug#64397: 29.0.91; Limited configuration of commands based on python-interpreter, Eli Zaretskii, 2023/07/15
- bug#64397: 29.0.91; Limited configuration of commands based on python-interpreter,
Matthias Meulien <=
- bug#64397: 29.0.91; Limited configuration of commands based on python-interpreter, Eli Zaretskii, 2023/07/20