[GR-21590] Update Python imports

PullRequest: graalpython/2003

Author: timfel

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "e43ce8dd99f09ee14703d1a6703658ee796059f1" }
+{ "overlay": "441cccb09e2ddd78106526da13cd2bf23af74c26" }

graalpython/com.oracle.graal.python.test/src/graalpytest.py

@@ -59,6 +59,10 @@
     'test_import',
     'test_subprocess',
     'test_posix',
+    'test_io',
+    'test_fileio',
+    'test_imaplib',
+    'test_multiprocessing_spawn',
     # trying to avoid transient issues there, not sure about the reason
     'test_unittest',
 ]

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_exceptionobject.py

@@ -66,13 +66,14 @@ def test_exc_info(self):
         tester = TestExcInfo()
         try:
             raise IndexError
-        except:
+        except IndexError:
             exc_type = tester.get_exc_info()
             assert exc_type == IndexError
 
             # do a second time because this time we won't do a stack walk
-            exc_type = tester.get_exc_info()
-            assert exc_type == IndexError
+            # disabled due to GR-34711
+            # exc_type = tester.get_exc_info()
+            # assert exc_type == IndexError
         else:
             assert False
 

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecencodings_cn.txt

@@ -19,4 +19,3 @@
 *graalpython.lib-python.3.test.test_codecencodings_cn.Test_GBK.test_streamwriter
 *graalpython.lib-python.3.test.test_codecencodings_cn.Test_GBK.test_streamwriter_reset_no_pending
 *graalpython.lib-python.3.test.test_codecencodings_cn.Test_GBK.test_xmlcharrefreplace
-*graalpython.lib-python.3.test.test_codecencodings_cn.Test_HZ.test_streamwriter_reset_no_pending

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -2164,7 +2164,7 @@ Object typeNew(VirtualFrame frame, Object cls, Object wName, PTuple bases, PDict
             Object winner = calculateMetaclass(frame, metaclass, bases, getClassNode, lookupMroEntriesNode);
             if (winner != metaclass) {
                 Object newFunc = getNewFuncNode.execute(winner);
-                if (newFunc instanceof PBuiltinFunction && (((PBuiltinFunction) newFunc).getFunctionRootNode() == getRootNode())) {
+                if (newFunc instanceof PBuiltinFunction && (((PBuiltinFunction) newFunc).getFunctionRootNode().getCallTarget() == getRootNode().getCallTarget())) {
                     metaclass = winner;
                     // the new metaclass has the same __new__ function as we are in, continue
                 } else {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/resources/reflect-config.json

@@ -50,5 +50,14 @@
 {
   "name":"com.ibm.icu.charset.CharsetHZ",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String", "java.lang.String", "java.lang.String[]"]}]
+},
+{
+  "name":"java.util.Locale",
+  "fields":[{"name":"US"}],
+  "methods":[{"name":"setDefault","parameterTypes":["java.util.Locale"]}]
+},
+{
+  "name":"java.lang.System",
+  "methods":[{"name":"getProperty","parameterTypes":["java.lang.String"]}]
 }
 ]

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/ExecutionContext.java

@@ -409,7 +409,9 @@ private static IndirectCallState enter(VirtualFrame frame, PythonThreadState pyt
         public static void exit(VirtualFrame frame, PythonLanguage language, PythonContext context, Object savedState) {
             if (savedState != null && frame != null && context != null) {
                 exit(frame, context.getThreadState(language), savedState);
+                return;
             }
+            assert savedState == null : "tried to exit an indirect call with state, but without frame/context";
         }
 
         public static void exit(VirtualFrame frame, PNodeWithRaiseAndIndirectCall indirectCallNode, Object savedState) {
@@ -418,24 +420,28 @@ public static void exit(VirtualFrame frame, PNodeWithRaiseAndIndirectCall indire
                 if (context != null) {
                     PythonLanguage language = indirectCallNode.getLanguage();
                     exit(frame, context.getThreadState(language), savedState);
+                    return;
                 }
             }
+            assert savedState == null : "tried to exit an indirect call with state, but without frame/context";
         }
 
         /**
          * @see #exit(VirtualFrame, PythonLanguage, PythonContext, Object)
          */
         public static void exit(VirtualFrame frame, PythonThreadState pythonThreadState, Object savedState) {
-            if (frame == null || savedState == null) {
+            if (frame == null) {
+                assert savedState == null : "tried to exit an indirect call with state, but without frame";
+                return;
+            }
+            if (savedState == null) {
                 return;
             }
             IndirectCallState state = (IndirectCallState) savedState;
             if (state.info != null) {
                 pythonThreadState.popTopFrameInfo();
             }
-            if (state.curExc != null) {
-                pythonThreadState.setCaughtException(state.curExc);
-            }
+            pythonThreadState.setCaughtException(state.curExc);
         }
     }
 
@@ -476,13 +482,6 @@ private static PFrame.Reference enter(PythonThreadState threadState, Object[] pA
 
             if (needsExceptionState) {
                 PException curExc = threadState.getCaughtException();
-                if (curExc == null) {
-                    CompilerDirectives.transferToInterpreter();
-                    PException fromStackWalk = GetCaughtExceptionNode.fullStackWalk();
-                    curExc = fromStackWalk != null ? fromStackWalk : PException.NO_EXCEPTION;
-                    // now, set in our args, such that we won't do this again
-                    threadState.setCaughtException(curExc);
-                }
                 PArguments.setException(pArguments, curExc);
             }
             return popTopFrameInfo;

graalpython/lib-graalpython/__graalpython__.py

@@ -41,7 +41,7 @@
 
 class SysState:
     def __init__(self):
-        self.recursionlimit = 1000
+        self.recursionlimit = 8000 if __graalpython__.is_native else 1000
         self.checkinterval = 100
         self.switchinterval = 0.005
 

graalpython/lib-graalpython/java.py

@@ -48,6 +48,9 @@ def is_java_package(name):
             package = type("java.lang.Package")
             return any(p.getName().startswith(name) for p in package.getPackages())
         except KeyError:
+            if name in ("java.lang", "java.util"):
+                # Some well-known packages that we always allow
+                return True
             if sys.flags.verbose:
                 from _warnings import warn
                 warn("Host lookup allowed, but java.lang.Package not available. Importing from Java cannot work.")

mx.graalpython/graalpython-bash-launcher

@@ -1,6 +1,4 @@
 DISABLE_INSTALLABLES=true
 DYNAMIC_IMPORTS=/substratevm
-COMPONENTS=LibGraal,Graal.Python
-FORCE_BASH_LAUNCHERS=true
-SKIP_LIBRARIES=
+NATIVE_IMAGES=lib:jvmcicompiler
 NO_LICENSES=true