Fix exitting from inspect mode

Author: msimacek

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -1253,7 +1253,7 @@ private int readEvalPrint(Context context, ConsoleHandler consoleHandler) {
                 } catch (EOFException e) {
                     if (!noSite) {
                         try {
-                            evalInternal(context, "import site; exit()\n");
+                            context.eval(Source.newBuilder(getLanguageId(), "import site; exit()\n", "<internal>").internal(true).interactive(true).buildLiteral());
                         } catch (PolyglotException e2) {
                             if (e2.isExit()) {
                                 // don't use the exit code from the PolyglotException

graalpython/com.oracle.graal.python.test/src/tests/test_repl.py

@@ -36,60 +36,77 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-
 import os
 import re
 import select
 import subprocess
 import sys
+import tempfile
 import termios
 from textwrap import dedent
 
 
-def validate_repl(stdin):
+def validate_repl(stdin, python_args=(), ignore_preamble=True):
     env = os.environ.copy()
     env['TERM'] = 'ansi'
     env['PYTHONIOENCODING'] = 'utf-8'
     pty_parent, pty_child = os.openpty()
-    termios.tcsetwinsize(pty_parent, (60, 80))
-    proc = subprocess.Popen([sys.executable, '-I'], env=env, stdin=pty_child, stdout=pty_child, stderr=pty_child)
-    out = ''
-    input_and_output = []
-    in_matches = list(re.finditer(r'^(>>>|\.\.\.) (.*)', stdin, flags=re.MULTILINE))
-    for i, match in enumerate(in_matches):
-        input_and_output.append((
-            match.group(1),
-            match.group(2),
-            stdin[match.end():in_matches[i + 1].start() - 1 if i + 1 < len(in_matches) else -1],
-        ))
-    first_prompt = True
-    index = 0
-    whole_out = ''
-    while True:
-        rlist, _, _ = select.select([pty_parent], [], [], 30)
-        assert pty_parent in rlist, f"Timed out waiting for REPL output. Output: {whole_out}{out}"
-        out += os.read(pty_parent, 1024).decode('utf-8')
-        out = out.replace('\r\n', '\n')
-        out = re.sub(r'\x1b\[(?:\?2004[hl]|\d+[A-G])', '', out)
-        if out.endswith(('\n>>> ', '\n... ')):
-            if not first_prompt:
+    try:
+        termios.tcsetwinsize(pty_parent, (60, 80))
+        proc = subprocess.Popen(
+            [sys.executable, '-I', *python_args],
+            env=env,
+            stdin=pty_child,
+            stdout=pty_child,
+            stderr=pty_child,
+        )
+        out = ''
+        input_and_output = []
+        expected_preamble = ''
+        in_matches = list(re.finditer(r'^(>>>|\.\.\.) (.*)', stdin, flags=re.MULTILINE))
+        for i, match in enumerate(in_matches):
+            if i == 0:
+                expected_preamble = stdin[:match.start() - 1] if match.start() else ''
+            input_and_output.append((
+                match.group(1),
+                match.group(2),
+                stdin[match.end():in_matches[i + 1].start() - 1 if i + 1 < len(in_matches) else -1],
+            ))
+        index = -1
+        whole_out = ''
+        while True:
+            rlist, _, _ = select.select([pty_parent], [], [], 30)
+            assert pty_parent in rlist, f"Timed out waiting for REPL output. Output: {whole_out}{out}"
+            out += os.read(pty_parent, 1024).decode('utf-8')
+            out = out.replace('\r\n', '\n')
+            out = re.sub(r'\x1b\[(?:\?2004[hl]|\d+[A-G])', '', out)
+            if out == '>>> ' or out.endswith(('\n>>> ', '\n... ')):
                 prompt = out[:3]
-                expected_prompt, current_in, expected_out = input_and_output[index]
-                assert prompt == expected_prompt
-                expected = f'{expected_prompt} {current_in}{expected_out}'
                 actual = out[:-5]
-                assert actual == expected, f'Actual:\n{actual!r}\nExpected:\n{expected!r}'
+                if index >= 0:
+                    expected_prompt, current_in, expected_out = input_and_output[index]
+                    assert prompt == expected_prompt
+                    expected = f'{expected_prompt} {current_in}{expected_out}'
+                else:
+                    expected = expected_preamble
+                if index >= 0 or not ignore_preamble:
+                    assert actual == expected, f'Actual:\n{actual!r}\nExpected:\n{expected!r}'
                 index += 1
-            first_prompt = False
-            whole_out += out[:-4]
-            out = out[-4:]
-            if index >= len(input_and_output):
-                os.close(pty_child)
-                os.close(pty_parent)
-                proc.wait(timeout=5)
-                return
-            _, next_in, _ = input_and_output[index]
-            os.write(pty_parent, next_in.encode('utf-8') + b'\r')
+                whole_out += out[:-4]
+                out = out[-4:]
+                if index >= len(input_and_output):
+                    os.write(pty_parent, b'\x04')  # CTRL-D
+                    proc.wait(timeout=30)
+                    out = os.read(pty_parent, 1024).decode('utf-8')
+                    out = re.sub(r'\x1b\[\?2004[hl]', '', out)
+                    assert not out.strip(), f"Garbage after EOF:\n{out!r}"
+                    return
+                else:
+                    _, next_in, _ = input_and_output[index]
+                    os.write(pty_parent, next_in.encode('utf-8') + b'\r')
+    finally:
+        os.close(pty_child)
+        os.close(pty_parent)
 
 
 def test_basic_repl():
@@ -99,6 +116,8 @@ def test_basic_repl():
         >>> None
         >>> "hello"
         'hello'
+        >>> _
+        'hello'
     """))
 
 
@@ -148,3 +167,27 @@ def test_exceptions():
           File "<stdin>", line 3, in __repr__
         NameError: name 'asdf' is not defined
     """))
+
+
+def test_inspect_flag():
+    with tempfile.NamedTemporaryFile('w') as f:
+        f.write('a = 1\n')
+        f.flush()
+        validate_repl(dedent("""\
+            >>> a
+            1
+        """), python_args=['-i', f.name], ignore_preamble=False)
+
+
+def test_inspect_flag_exit():
+    with tempfile.NamedTemporaryFile('w') as f:
+        f.write('a = 1\nimport sys\nsys.exit(1)\n')
+        f.flush()
+        validate_repl(dedent(f"""\
+            Traceback (most recent call last):
+              File "{f.name}", line 3, in <module>
+                sys.exit(1)
+            SystemExit: 1
+            >>> a
+            1
+        """), python_args=['-i', f.name], ignore_preamble=False)