[GR-21590] Update imports

PullRequest: graalpython/1287

Author: msimacek

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "c5a49da5ac8d3ef1beefe6cbce5ebb2618a74e10" }
+{ "overlay": "883cec58bc69d36f96f09c393804b65df020d67a" }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -70,7 +70,6 @@
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Scope;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage;
@@ -469,14 +468,17 @@ protected boolean isVisible(PythonContext context, Object value) {
 
     @Override
     @TruffleBoundary
-    protected Iterable<Scope> findLocalScopes(PythonContext context, Node node, Frame frame) {
-        ArrayList<Scope> scopes = new ArrayList<>();
-        for (Scope s : super.findLocalScopes(context, node, frame)) {
+    // Remove in GR-26206
+    @SuppressWarnings("deprecation")
+    protected Iterable<com.oracle.truffle.api.Scope> findLocalScopes(PythonContext context, Node node, Frame frame) {
+        ArrayList<com.oracle.truffle.api.Scope> scopes = new ArrayList<>();
+        for (com.oracle.truffle.api.Scope s : super.findLocalScopes(context, node, frame)) {
             if (frame == null) {
                 PFunctionArgsFinder argsFinder = new PFunctionArgsFinder(node);
 
-                Scope.Builder scopeBuilder = Scope.newBuilder(s.getName(), s.getVariables()).node(s.getNode()).receiver(s.getReceiverName(), s.getReceiver()).rootInstance(
-                                s.getRootInstance()).arguments(argsFinder.collectArgs());
+                com.oracle.truffle.api.Scope.Builder scopeBuilder = com.oracle.truffle.api.Scope.newBuilder(s.getName(), s.getVariables()).node(s.getNode()).receiver(s.getReceiverName(),
+                                s.getReceiver()).rootInstance(
+                                                s.getRootInstance()).arguments(argsFinder.collectArgs());
 
                 scopes.add(scopeBuilder.build());
             } else {
@@ -487,11 +489,11 @@ protected Iterable<Scope> findLocalScopes(PythonContext context, Node node, Fram
         if (frame != null) {
             PythonObject globals = PArguments.getGlobalsSafe(frame);
             if (globals != null) {
-                scopes.add(Scope.newBuilder("globals()", scopeFromObject(globals)).build());
+                scopes.add(com.oracle.truffle.api.Scope.newBuilder("globals()", scopeFromObject(globals)).build());
             }
             Frame generatorFrame = PArguments.getGeneratorFrameSafe(frame);
             if (generatorFrame != null) {
-                for (Scope s : super.findLocalScopes(context, node, generatorFrame)) {
+                for (com.oracle.truffle.api.Scope s : super.findLocalScopes(context, node, generatorFrame)) {
                     scopes.add(s);
                 }
             }
@@ -508,12 +510,14 @@ private static InteropMap scopeFromObject(PythonObject globals) {
     }
 
     @Override
-    protected Iterable<Scope> findTopScopes(PythonContext context) {
-        ArrayList<Scope> scopes = new ArrayList<>();
+    // Remove in GR-26206
+    @SuppressWarnings("deprecation")
+    protected Iterable<com.oracle.truffle.api.Scope> findTopScopes(PythonContext context) {
+        ArrayList<com.oracle.truffle.api.Scope> scopes = new ArrayList<>();
         if (context.getBuiltins() != null) {
             // false during initialization
-            scopes.add(Scope.newBuilder(BuiltinNames.__MAIN__, context.getMainModule()).build());
-            scopes.add(Scope.newBuilder(BuiltinNames.BUILTINS, scopeFromObject(context.getBuiltins())).build());
+            scopes.add(com.oracle.truffle.api.Scope.newBuilder(BuiltinNames.__MAIN__, context.getMainModule()).build());
+            scopes.add(com.oracle.truffle.api.Scope.newBuilder(BuiltinNames.BUILTINS, scopeFromObject(context.getBuiltins())).build());
         }
         return scopes;
     }

mx.graalpython/suite.py

@@ -44,23 +44,23 @@
             },
             {
                 "name": "tools",
-                "version": "19b918f7f84eb5afbe2a8e3db83b0b5d86738551",
+                "version": "930d205ff03a359f51b877432ce5c6946df9cd1c",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "19b918f7f84eb5afbe2a8e3db83b0b5d86738551",
+                "version": "930d205ff03a359f51b877432ce5c6946df9cd1c",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "19b918f7f84eb5afbe2a8e3db83b0b5d86738551",
+                "version": "930d205ff03a359f51b877432ce5c6946df9cd1c",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},