commit c22cd416e51df60c3ab67a228c646494cca5048b
Author: Pavel Sanda <[email protected]>
Date: Sat Sep 26 00:32:38 2026 +0200
python 2->3 leftovers in os.cpp
LyX requires python 3 from 2.5.x.
https://www.mail-archive.com/[email protected]/msg226783.html
Assisted-by: Jose :)
---
src/support/os.cpp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/support/os.cpp b/src/support/os.cpp
index a368f037e5..a2e0afd02e 100644
--- a/src/support/os.cpp
+++ b/src/support/os.cpp
@@ -66,10 +66,9 @@ static string const python_call(string const & binary, bool
verbose = false)
if (verbose)
lyxerr << "Examining " << binary << "\n";
- // Check whether this is a python 2 or 3 binary. The candidate may be
- // a bare name ("python3"), a name plus argument ("py -3") or a quoted
- // absolute path found with walking-path fallback; split it into argv
- // so the probe never goes through a shell.
+ // The candidate may be a bare name ("python3"), a name plus argument
+ // ("py -3") or a quoted absolute path found with walking-path fallback;
+ // split it into argv so the probe never goes through a shell.
vector<string> argv = splitCommandTokens(binary);
if (argv.empty())
return string();
@@ -185,7 +184,7 @@ vector<string> pythonArgvForm()
// consumers: About dialog
string const python_info()
{
- const string info_script = "import sys; print('{}
({})'.format(sys.version.split()[0],sys.executable), end='')";
+ const string info_script = "import sys;
print(f'{sys.version.split()[0]} ({sys.executable})', end='')";
if (!hasPython())
return("None");
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
