[GR-14247] Remove loading python source from URL (Jar)

PullRequest: graalpython/422

Author: HGuiroux

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

@@ -26,7 +26,6 @@
 package com.oracle.graal.python;
 
 import java.io.IOException;
-import java.net.URL;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.concurrent.ConcurrentHashMap;
@@ -520,20 +519,6 @@ public Source newSource(PythonContext ctxt, TruffleFile src, String name) throws
         }
     }
 
-    public Source newSource(PythonContext ctxt, URL url, String name) throws IOException {
-        try {
-            return cachedSources.computeIfAbsent(url, t -> {
-                try {
-                    return newSource(ctxt, Source.newBuilder(ID, url).name(name));
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            });
-        } catch (RuntimeException e) {
-            throw (IOException) e.getCause();
-        }
-    }
-
     private static Source newSource(PythonContext ctxt, SourceBuilder srcBuilder) throws IOException {
         boolean coreIsInitialized = ctxt.getCore().isInitialized();
         boolean internal = !coreIsInitialized && !PythonOptions.getOption(ctxt, PythonOptions.ExposeInternalSources);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -31,8 +31,6 @@
 
 import java.io.IOException;
 import java.math.BigInteger;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -598,34 +596,19 @@ private void addBuiltinsTo(PythonObject obj, PythonBuiltins builtinsForObj) {
 
     @TruffleBoundary
     private Source getSource(String basename, String prefix) {
-        URL url = null;
-        try {
-            url = new URL(prefix);
-        } catch (MalformedURLException e) {
-            // pass
-        }
         String suffix = FILE_SEPARATOR + basename + ".py";
         PythonContext ctxt = getContext();
-        if (url != null) {
-            // This path is hit when we load the core library e.g. from a Jar file
-            try {
-                return getLanguage().newSource(ctxt, new URL(url + suffix), basename);
-            } catch (IOException e) {
-                throw new RuntimeException("Could not read core library from " + url);
-            }
-        } else {
-            Env env = ctxt.getEnv();
-            TruffleFile file = env.getTruffleFile(prefix + suffix);
-            try {
-                if (file.exists()) {
-                    return getLanguage().newSource(ctxt, file, basename);
-                }
-            } catch (SecurityException | IOException t) {
-                // fall through;
+        Env env = ctxt.getEnv();
+        TruffleFile file = env.getTruffleFile(prefix + suffix);
+        try {
+            if (file.exists()) {
+                return getLanguage().newSource(ctxt, file, basename);
             }
-            PythonLanguage.getLogger().log(Level.SEVERE, "Startup failed, could not read core library from " + file + ". Maybe you need to set python.CoreHome and python.StdLibHome.");
-            throw new RuntimeException();
+        } catch (SecurityException | IOException t) {
+            // fall through;
         }
+        PythonLanguage.getLogger().log(Level.SEVERE, "Startup failed, could not read core library from " + file + ". Maybe you need to set python.CoreHome and python.StdLibHome.");
+        throw new RuntimeException();
     }
 
     private void loadFile(String s, String prefix) {