Skip to content

Commit dd2b680

Browse files
committed
[GR-14416] Use file separators from Truffle filesystem
PullRequest: graalpython/447
2 parents 7b5a9ec + ac8cc14 commit dd2b680

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,9 +599,9 @@ private void addBuiltinsTo(PythonObject obj, PythonBuiltins builtinsForObj) {
599599

600600
@TruffleBoundary
601601
private Source getSource(String basename, String prefix) {
602-
String suffix = FILE_SEPARATOR + basename + ".py";
603602
PythonContext ctxt = getContext();
604603
Env env = ctxt.getEnv();
604+
String suffix = env.getFileNameSeparator() + basename + ".py";
605605
TruffleFile file = env.getTruffleFile(prefix + suffix);
606606
try {
607607
if (file.exists()) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ private void ensureCapiWasLoaded() {
231231
if (!ctxt.capiWasLoaded()) {
232232
Env env = ctxt.getEnv();
233233
CompilerDirectives.transferToInterpreterAndInvalidate();
234-
TruffleFile capiFile = env.getTruffleFile(PythonCore.getCoreHome(env) + PythonCore.FILE_SEPARATOR + "capi.bc");
234+
TruffleFile capiFile = env.getTruffleFile(PythonCore.getCoreHome(env) + env.getFileNameSeparator() + "capi.bc");
235235
Object capi = null;
236236
try {
237237
SourceBuilder capiSrcBuilder = Source.newBuilder(LLVM_LANGUAGE, capiFile);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ public void postInitialize(PythonCore core) {
216216
path[pathIdx++] = getScriptPath(env, args);
217217
}
218218
path[pathIdx++] = PythonCore.getStdlibHome(env);
219-
path[pathIdx++] = PythonCore.getCoreHome(env) + PythonCore.FILE_SEPARATOR + "modules";
219+
path[pathIdx++] = PythonCore.getCoreHome(env) + env.getFileNameSeparator() + "modules";
220220
PList sysPaths = core.factory().createList(path);
221221
sys.setAttribute("path", sysPaths);
222222
}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonCore.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
* Storage for initialized Python built-in modules and types.
4343
*/
4444
public interface PythonCore extends ParserErrorCallback {
45-
public static final String FILE_SEPARATOR = File.separator;
4645
public static final String PATH_SEPARATOR = File.pathSeparator;
4746
static final String PREFIX = "/";
4847
static final String LIB_PYTHON_3 = "/lib-python/3";

0 commit comments

Comments
 (0)