bug#25025: python-shell-calculate-command is wrong

[npostavs@users.sourceforge.net]

[-- Attachment #1: Type: text/plain, Size: 627 bytes --]

npostavs@users.sourceforge.net writes:

> Okay, it looks like the consensus is that we should apply the
> `combine-and-quote-strings' fix for now, and possibly in future switch
> to something more shell based.
>
> I've pushed it to master as 8f611e5e2309 "Fix bad quoting of
> python-shell-interpreter", and I'm closing this bug.

This broke the test python-shell-calculate-command-1 on Windows.  We
could update the test to match the new python-shell-calculate-command
implementation, but since the test body is basically just a copy of that
function, it looks pretty useless to me.  I think we should just remove
that test.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch --]
[-- Type: text/x-diff, Size: 1743 bytes --]

From 1173da346a388a7258a8b462ef5a5d9416781245 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@gmail.com>
Date: Wed, 16 Aug 2017 07:06:38 -0400
Subject: [PATCH] ; Remove python-shell-calculate-command-1 test

* test/lisp/progmodes/python-tests.el
(python-shell-calculate-pythonpath-1): Remove, it merely reprises the
body of `python-shell-calculate-command' and it has been broken on w32
since the fix for Bug#25025 was applied.
---
 test/lisp/progmodes/python-tests.el | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/test/lisp/progmodes/python-tests.el b/test/lisp/progmodes/python-tests.el
index 8795da4ef4..1a8c6a4e8c 100644
--- a/test/lisp/progmodes/python-tests.el
+++ b/test/lisp/progmodes/python-tests.el
@@ -2546,20 +2546,6 @@ python-tests-shell-interpreter
    (should (string= (python-shell-internal-get-process-name)
                     (format "%s[%s]" python-shell-internal-buffer-name (buffer-name))))))
 
-(ert-deftest python-shell-calculate-command-1 ()
-  "Check the command to execute is calculated correctly.
-Using `python-shell-interpreter' and
-`python-shell-interpreter-args'."
-  (skip-unless (executable-find python-tests-shell-interpreter))
-  (let ((python-shell-interpreter (executable-find
-                                   python-tests-shell-interpreter))
-        (python-shell-interpreter-args "-B"))
-    (should (string=
-             (format "%s %s"
-                     (shell-quote-argument python-shell-interpreter)
-                     python-shell-interpreter-args)
-             (python-shell-calculate-command)))))
-
 (ert-deftest python-shell-calculate-pythonpath-1 ()
   "Test PYTHONPATH calculation."
   (let ((process-environment '("PYTHONPATH=/path0"))
-- 
2.14.1