Skip to content

Commit 122df4a

Browse files
committed
[GR-47167] Fix running Python with all its jars and dependencies only on the module-path.
PullRequest: graalpython/2868
2 parents 4aebb04 + acdfcc0 commit 122df4a

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/DynamicObjectStorage.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
import com.oracle.truffle.api.profiles.InlinedBranchProfile;
8080
import com.oracle.truffle.api.profiles.InlinedConditionProfile;
8181
import com.oracle.truffle.api.strings.TruffleString;
82-
import com.oracle.truffle.object.ShapeImpl;
8382

8483
/**
8584
* This storage keeps a reference to the MRO when used for a type dict. Writing to this storage will
@@ -124,7 +123,7 @@ protected static Object[] keyArray(DynamicObjectStorage self) {
124123
}
125124

126125
protected static Object[] keyArray(Shape shape) {
127-
return ((ShapeImpl) shape).getKeyArray();
126+
return shape.getKeyList().toArray();
128127
}
129128

130129
@GenerateUncached

mx.graalpython/suite.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@
350350
"GRAALPYTHON-LAUNCHER",
351351
"GRAALPYTHON_NATIVE_LIBS",
352352
"truffle:TRUFFLE_API",
353-
"tools:TRUFFLE_COVERAGE",
354353
"tools:TRUFFLE_PROFILER",
355354
"regex:TREGEX",
356355
"sdk:GRAAL_SDK",
@@ -370,7 +369,6 @@
370369
"com.oracle.graal.python.pegparser",
371370
"truffle:TRUFFLE_API",
372371
"truffle:TRUFFLE_NFI",
373-
"tools:TRUFFLE_COVERAGE",
374372
"tools:TRUFFLE_PROFILER",
375373
"sdk:GRAAL_SDK",
376374
"sulong:SULONG_API",
@@ -381,6 +379,7 @@
381379
"BOUNCYCASTLE-PKIX",
382380
],
383381
"requires": [
382+
"java.logging",
384383
"java.management",
385384
"jdk.management",
386385
"jdk.unsupported",
@@ -875,7 +874,6 @@
875874
"distDependencies": [
876875
"GRAALPYTHON_NATIVE_LIBS",
877876
"truffle:TRUFFLE_API",
878-
"tools:TRUFFLE_COVERAGE",
879877
"tools:TRUFFLE_PROFILER",
880878
"regex:TREGEX",
881879
"sdk:GRAAL_SDK",

0 commit comments

Comments
 (0)