Remove the unused ServiceLoader for PythonBuiltins

Author: eregon

graalpython/com.oracle.graal.python.test/src/META-INF/services/com.oracle.graal.python.builtins.PythonBuiltins

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -40,11 +40,7 @@
      */
     PythonOS os() default PythonOS.PLATFORM_ANY;
 
-    String publicName() default "";
-
     PythonBuiltinClassType[] extendClasses() default {};
 
-    String pythonFile() default "";
-
     boolean isEager() default false;
 }

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/advanced/CustomBuiltinsTest.java

@@ -56,11 +56,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.ServiceLoader;
 import java.util.logging.Level;
 
-import org.graalvm.nativeimage.ImageInfo;
-
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.modules.AbcModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.ArrayModuleBuiltins;
@@ -419,28 +416,15 @@ public abstract class Python3Core {
 
     private static TruffleString[] initializeCoreFiles() {
         // Order matters!
-        List<TruffleString> coreFiles = new ArrayList<>(Arrays.asList(
+        return new TruffleString[]{
                         toTruffleStringUncached("__graalpython__"),
                         toTruffleStringUncached("_weakref"),
                         toTruffleStringUncached("unicodedata"),
                         toTruffleStringUncached("_sre"),
                         toTruffleStringUncached("_sysconfig"),
                         toTruffleStringUncached("java"),
-                        toTruffleStringUncached("pip_hook")));
-        // add service loader defined python file extensions
-        if (!ImageInfo.inImageRuntimeCode()) {
-            ServiceLoader<PythonBuiltins> providers = ServiceLoader.load(PythonBuiltins.class, Python3Core.class.getClassLoader());
-            PythonOS currentOs = PythonOS.getPythonOS();
-            for (PythonBuiltins builtin : providers) {
-                CoreFunctions annotation = builtin.getClass().getAnnotation(CoreFunctions.class);
-                if (!annotation.pythonFile().isEmpty() &&
-                                (annotation.os() == PythonOS.PLATFORM_ANY || annotation.os() == currentOs)) {
-                    coreFiles.add(toTruffleStringUncached(annotation.pythonFile()));
-                }
-            }
-        }
-        coreFiles.removeAll(Arrays.asList(new TruffleString[]{null}));
-        return coreFiles.toArray(new TruffleString[coreFiles.size()]);
+                        toTruffleStringUncached("pip_hook")
+        };
     }
 
     private final PythonBuiltins[] builtins;
@@ -810,10 +794,6 @@ private static PythonBuiltins[] initializeBuiltins(TruffleLanguage.Env env) {
             builtins.add(new BZ2DecompressorBuiltins());
             builtins.add(new BZ2ModuleBuiltins());
         }
-        ServiceLoader<PythonBuiltins> providers = ServiceLoader.load(PythonBuiltins.class, Python3Core.class.getClassLoader());
-        for (PythonBuiltins builtin : providers) {
-            builtins.add(builtin);
-        }
         filterBuiltins(builtins);
         return builtins.toArray(new PythonBuiltins[builtins.size()]);
     }

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/advanced/CustomModule.java

@@ -1147,9 +1147,6 @@
                 "exports": [
                     "com.oracle.graal.python.* to org.graalvm.py.enterprise",
                 ],
-                "uses": [
-                    "com.oracle.graal.python.builtins.PythonBuiltins",
-                ],
             },
             "useModulePath": True,
             "dependencies": [