From 5adc1b719d2a89b9753ae73a912ef698382bb558 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Sat, 1 Jul 2023 22:45:10 +0100 Subject: [PATCH] better string to match (for various lisps) --- src/sage/features/fricas.py | 2 +- src/sage/interfaces/fricas.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sage/features/fricas.py b/src/sage/features/fricas.py index 0d22073ae73..a52e082d114 100644 --- a/src/sage/features/fricas.py +++ b/src/sage/features/fricas.py @@ -54,7 +54,7 @@ def is_functional(self): return FeatureTestResult(self, False, reason="Call `{command}` failed with exit code {e.returncode}".format(command=" ".join(command), e=e)) - expected = b"Checking" + expected = b"FriCAS" if lines.find(expected) == -1: return FeatureTestResult(self, False, reason="Call `{command}` did not produce output which contains `{expected}`".format(command=" ".join(command), expected=expected)) diff --git a/src/sage/interfaces/fricas.py b/src/sage/interfaces/fricas.py index 0ee947dc29a..b0a680b81a5 100644 --- a/src/sage/interfaces/fricas.py +++ b/src/sage/interfaces/fricas.py @@ -291,7 +291,7 @@ def __init__(self, name='fricas', command=None, """ from sage.features.fricas import FriCAS FriCAS().require() - options =" -nosman" + options + options ="-nosman" + options import shlex command = '{} {}'.format(shlex.quote(FriCAS().absolute_filename()), options)