diff --git a/src/sage/interfaces/expect.py b/src/sage/interfaces/expect.py index ff424335d56..80ef6e4078d 100644 --- a/src/sage/interfaces/expect.py +++ b/src/sage/interfaces/expect.py @@ -1238,7 +1238,7 @@ def _expect_expr(self, expr=None, timeout=None): sage: print(sage0.eval("dummy=gp.eval('0'); alarm(1); gp._expect_expr('1')")) # long time ...Interrupting PARI/GP interpreter. Please wait a few seconds... ... - AlarmInterrupt: + ...AlarmInterrupt... """ if expr is None: # the following works around gap._prompt_wait not being defined diff --git a/src/sage/interfaces/sage0.py b/src/sage/interfaces/sage0.py index 6baf1092479..f7158233836 100644 --- a/src/sage/interfaces/sage0.py +++ b/src/sage/interfaces/sage0.py @@ -129,7 +129,6 @@ class Sage(ExtraTabCompletion, Expect): def __init__(self, logfile=None, preparse=True, - python=False, init_code=None, server=None, server_tmpdir=None, @@ -154,24 +153,10 @@ def __init__(self, 'init_code should be a string or an iterable of lines ' 'of code') - if python: - command = 'python -u' - prompt = re.compile(b'>>> ') - environment = 'sage.all' - init_code.append(f'from {environment} import *') - else: - command = ' '.join([ - 'sage-ipython', - # Disable the IPython history (implemented as SQLite database) - # to avoid problems with locking. - '--HistoryManager.hist_file=:memory:', - # Disable everything that prints ANSI codes - '--colors=nocolor', - '--no-term-title', - '--simple-prompt', - ]) - prompt = re.compile(b'sage: ') - + command = 'python -u' + prompt = re.compile(b'>>> ') + environment = 'sage.all' + init_code.append(f'from {environment} import *') init_code.append('import pickle') init_code.append(textwrap.dedent(""" def _sage0_load_local(filename):