try another workaround for svm and very basic java imports now

timfel · timfel · commit a7b2503e6911 · 2021-10-26T16:22:19.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/resources/reflect-config.json b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/resources/reflect-config.json
@@ -59,12 +59,5 @@
 {
   "name":"java.lang.System",
   "methods":[{"name":"getProperty","parameterTypes":["java.lang.String"]}]
-},
-{
-  "name":"java.lang.Package",
-  "methods":[
-    {"name":"getPackages","parameterTypes":[]},
-    {"name":"getName","parameterTypes":[]}
-  ]
 }
 ]
diff --git a/graalpython/lib-graalpython/java.py b/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.")

Original file line number	Diff line number	Diff line change
`@@ -59,12 +59,5 @@`
`59`	`59`	`{`
`60`	`60`	`"name":"java.lang.System",`
`61`	`61`	`"methods":[{"name":"getProperty","parameterTypes":["java.lang.String"]}]`
`62`		`-},`
`63`		`-{`
`64`		`- "name":"java.lang.Package",`
`65`		`- "methods":[`
`66`		`- {"name":"getPackages","parameterTypes":[]},`
`67`		`- {"name":"getName","parameterTypes":[]}`
`68`		`- ]`
`69`	`62`	`}`
`70`	`63`	`]`