Skip to content

Commit 9ee169e

Browse files
committed
Use Truffle env to get pathSeparatorChar
1 parent def4639 commit 9ee169e

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,12 @@
6767
import static com.oracle.graal.python.util.PythonUtils.toTruffleStringUncached;
6868
import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
6969

70-
import java.io.File;
7170
import java.io.IOException;
7271
import java.io.InputStreamReader;
7372
import java.io.PrintWriter;
7473
import java.lang.management.ManagementFactory;
7574
import java.lang.reflect.Method;
7675
import java.nio.charset.StandardCharsets;
77-
import java.nio.file.Files;
78-
import java.nio.file.InvalidPathException;
79-
import java.nio.file.Path;
80-
import java.nio.file.Paths;
8176
import java.util.Arrays;
8277
import java.util.List;
8378
import java.util.logging.Level;
@@ -642,7 +637,7 @@ private static int which() {
642637
if (path != null) {
643638
for (int i = 0; i < C_COMPILER_PRECEDENCE.length; i++) {
644639
int last = 0;
645-
for (int j = path.indexOf(File.pathSeparatorChar); j != -1; j = path.indexOf(File.pathSeparatorChar, last)) {
640+
for (int j = path.indexOf(env.getPathSeparator()); j != -1; j = path.indexOf(env.getPathSeparator(), last)) {
646641
try {
647642
if (env.getPublicTruffleFile(path.substring(last, j)).resolve(C_COMPILER_PRECEDENCE[i]).isExecutable()) {
648643
return i;
@@ -912,6 +907,7 @@ TruffleString doit(VirtualFrame frame,
912907
@Builtin(name = "java_assert", minNumOfPositionalArgs = 0)
913908
@GenerateNodeFactory
914909
abstract static class JavaAssertNode extends PythonBuiltinNode {
910+
@SuppressWarnings("all")
915911
@Specialization
916912
Object doit() {
917913
boolean assertOn = false;
@@ -1027,7 +1023,7 @@ abstract static class GetPythonHomePaths extends PythonBuiltinNode {
10271023
@Specialization
10281024
TruffleString get() {
10291025
PythonContext context = getContext();
1030-
TruffleString sep = TruffleString.fromJavaStringUncached(File.pathSeparator, TS_ENCODING);
1026+
TruffleString sep = TruffleString.fromJavaStringUncached(context.getEnv().getPathSeparator(), TS_ENCODING);
10311027
return context.getStdlibHome().concatUncached(sep, TS_ENCODING, false).concatUncached(context.getCoreHome(), TS_ENCODING, false);
10321028
}
10331029
}
@@ -1106,6 +1102,7 @@ Object foreignNumberList(Object number) {
11061102
return new ForeignNumberList(number);
11071103
}
11081104

1105+
@SuppressWarnings("static-method")
11091106
@ExportLibrary(value = InteropLibrary.class, delegateTo = "number")
11101107
static final class ForeignNumberList implements TruffleObject {
11111108
final Object number;
@@ -1150,7 +1147,7 @@ Object foreignWrapper(Object object) {
11501147
return new ForeignWrapper(object);
11511148
}
11521149

1153-
@SuppressWarnings("unused")
1150+
@SuppressWarnings({"unused", "static-method"})
11541151
@ExportLibrary(value = InteropLibrary.class, delegateTo = "object")
11551152
static final class ForeignWrapper implements TruffleObject {
11561153
final Object object;

0 commit comments

Comments
 (0)