[GR-45906] Improve the embedder ux by returning the module itself when evaluating python code and the code does not end with an expression.

PullRequest: graalpython/2761

Author: timfel

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/InteropLibraryTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -143,7 +143,7 @@ public void testPListRemovable() {
 
     @Test
     public void testIsNull() {
-        assertTrue(v("None").isNull());
+        assertTrue(v("[None]").getArrayElement(0).isNull());
     }
 
     @Test

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

@@ -291,6 +291,14 @@ def test_internal_languages_dont_eval():
 
         assert polyglot.eval(language="python", string="21 * 2") == 42
 
+    def test_module_eval_returns_last_expr():
+        assert polyglot.eval(language="python", string="x = 2; x") == 2
+
+    def test_module_eval_returns_module():
+        mod = polyglot.eval(language="python", string="x = 2")
+        assert mod.x == 2
+        assert type(mod) == type(sys)
+
     @skipIf(is_native, "not supported in native mode")
     def test_non_index_array_access():
         import java

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/exception/TopLevelExceptionHandler.java

@@ -292,19 +292,25 @@ private Object run(VirtualFrame frame) {
             PArguments.setArgument(arguments, i, frame.getArguments()[i]);
         }
         PythonContext pythonContext = getContext();
+        PythonModule mainModule = null;
         if (getSourceSection().getSource().isInternal()) {
             // internal sources are not run in the main module
             PArguments.setGlobals(arguments, pythonContext.factory().createDict());
         } else {
-            PythonModule mainModule = pythonContext.getMainModule();
+            mainModule = pythonContext.getMainModule();
             PDict mainDict = GetOrCreateDictNode.getUncached().execute(mainModule);
             PArguments.setGlobals(arguments, mainModule);
             PArguments.setSpecialArgument(arguments, mainDict);
             PArguments.setException(arguments, PException.NO_EXCEPTION);
         }
         Object state = IndirectCalleeContext.enterIndirect(getPythonLanguage(), pythonContext, arguments);
         try {
-            return innerCallTarget.call(arguments);
+            Object result = innerCallTarget.call(arguments);
+            if (mainModule != null && result == PNone.NONE) {
+                return mainModule;
+            } else {
+                return result;
+            }
         } finally {
             IndirectCalleeContext.exit(getPythonLanguage(), pythonContext, state);
         }