[GR-21590] Update Python imports.

PullRequest: graalpython/3317

Author: timfel

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "ee6848c16e00a4b50f4e377ee3e3c941f67662d0" }
+{ "overlay": "6d170b8abc2a32d4754de9fd3f9a42d2fc50b326" }

mx.graalpython/mx_graalpython.py

@@ -824,7 +824,12 @@ def find_eclipse():
 def set_env(**environ):
     """Temporarily set the process environment variables"""
     old_environ = dict(os.environ)
-    os.environ.update(environ)
+    for k, v in environ.items():
+        if v is None:
+            if k in os.environ:
+                del os.environ[k]
+        else:
+            os.environ[k] = v
     try:
         yield
     finally:
@@ -1553,10 +1558,11 @@ def graalpython_gate_runner(args, tasks):
 
     with Task('GraalPython GraalVM build', tasks, tags=[GraalPythonTags.svm, GraalPythonTags.graalvm], report=True) as task:
         if task:
-            svm_image = python_svm()
-            benchmark = os.path.join(PATH_MESO, "image-magix.py")
-            out = mx.OutputCapture()
-            mx.run([svm_image, "-v", "-S", "--log.python.level=FINEST", benchmark], nonZeroIsFatal=True, out=mx.TeeOutputCapture(out), err=mx.TeeOutputCapture(out))
+            with set_env(PYTHONIOENCODING=None):
+                svm_image = python_svm()
+                benchmark = os.path.join(PATH_MESO, "image-magix.py")
+                out = mx.OutputCapture()
+                mx.run([svm_image, "-v", "-S", "--log.python.level=FINEST", benchmark], nonZeroIsFatal=True, out=mx.TeeOutputCapture(out), err=mx.TeeOutputCapture(out))
             success = "\n".join([
                 "[0, 0, 0, 0, 0, 0, 10, 10, 10, 0, 0, 10, 3, 10, 0, 0, 10, 10, 10, 0, 0, 0, 0, 0, 0]",
             ])

mx.graalpython/suite.py

@@ -45,31 +45,31 @@
             },
             {
                 "name": "sdk",
-                "version": "d719a133492c71209ded8121341ffdabdc2b8b66",
+                "version": "45b93388796aff34c6362c3d6607fdaef3b47468",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "tools",
-                "version": "d719a133492c71209ded8121341ffdabdc2b8b66",
+                "version": "45b93388796aff34c6362c3d6607fdaef3b47468",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "d719a133492c71209ded8121341ffdabdc2b8b66",
+                "version": "45b93388796aff34c6362c3d6607fdaef3b47468",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "d719a133492c71209ded8121341ffdabdc2b8b66",
+                "version": "45b93388796aff34c6362c3d6607fdaef3b47468",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},