[GR-14416] Get rid of remaining users of Java path and file separators

PullRequest: graalpython/555

Author: timfel

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

@@ -95,7 +95,7 @@ public abstract static class ZipImporterNode extends PythonBinaryBuiltinNode {
         public PZipImporter createNew(LazyPythonClass cls, @SuppressWarnings("unused") Object path,
                         @Cached("create()") ReadAttributeFromObjectNode readNode) {
             PythonModule module = getCore().lookupBuiltinModule(ZIPIMPORT_MODULE_NAME);
-            return factory().createZipImporter(cls, (PDict) readNode.execute(module, ZIP_DIRECTORY_CACHE_NAME));
+            return factory().createZipImporter(cls, (PDict) readNode.execute(module, ZIP_DIRECTORY_CACHE_NAME), getContext().getEnv().getFileNameSeparator());
         }
 
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/zipimporter/PZipImporter.java

@@ -26,7 +26,6 @@
 package com.oracle.graal.python.builtins.objects.zipimporter;
 
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -42,9 +41,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 
 public class PZipImporter extends PythonBuiltinObject {
-
-    public static final String SEPARATOR = File.separator;
-
     /**
      * pathname of the Zip archive
      */
@@ -73,6 +69,11 @@ private static enum EntryType {
         IS_PACKAGE
     }
 
+    /**
+     * The separatorChar used in the context for this importer
+     */
+    private final String separator;
+
     private static class SearchOrderEntry {
 
         String suffix;
@@ -100,7 +101,7 @@ protected static class ModuleCodeData {
     /**
      * Defines how the source and module will be searched in archive.
      */
-    private static SearchOrderEntry[] searchOrder;
+    private final SearchOrderEntry[] searchOrder;
 
     /**
      * Module information
@@ -112,25 +113,28 @@ public static enum ModuleInfo {
         PACKAGE
     }
 
-    public PZipImporter(LazyPythonClass cls, PDict zipDirectoryCache) {
+    public PZipImporter(LazyPythonClass cls, PDict zipDirectoryCache, String separator) {
         super(cls);
         this.archive = null;
         this.prefix = null;
+        this.separator = separator;
         this.moduleZipDirectoryCache = zipDirectoryCache;
-        if (searchOrder == null) { // define the order once
-            searchOrder = defineSearchOrder();
-        }
+        this.searchOrder = defineSearchOrder();
     }
 
-    @CompilerDirectives.TruffleBoundary
-    private static SearchOrderEntry[] defineSearchOrder() {
+    private SearchOrderEntry[] defineSearchOrder() {
         return new SearchOrderEntry[]{
-                        new SearchOrderEntry(SEPARATOR + "__init__.py",
+                        new SearchOrderEntry(joinStrings(separator, "__init__.py"),
                                         EnumSet.of(EntryType.IS_PACKAGE, EntryType.IS_SOURCE)),
                         new SearchOrderEntry(".py", EnumSet.of(EntryType.IS_SOURCE))
         };
     }
 
+    @TruffleBoundary
+    private static String joinStrings(String a, String b) {
+        return a + b;
+    }
+
     public PDict getZipDirectoryCache() {
         return moduleZipDirectoryCache;
     }
@@ -181,7 +185,7 @@ protected String getSubname(String fullname) {
 
     @TruffleBoundary
     protected String makeFilename(String fullname) {
-        return prefix + getSubname(fullname).replace('.', File.separatorChar);
+        return prefix + getSubname(fullname).replace(".", separator);
     }
 
     protected PTuple getEntry(String filenameAndSuffix) {
@@ -190,7 +194,7 @@ protected PTuple getEntry(String filenameAndSuffix) {
 
     @TruffleBoundary
     protected String makePackagePath(String fullname) {
-        return archive + SEPARATOR + prefix + getSubname(fullname);
+        return archive + separator + prefix + getSubname(fullname);
     }
 
     /**

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/zipimporter/ZipImporterBuiltins.java

@@ -29,7 +29,6 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__REPR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__STR__;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.StandardOpenOption;
@@ -221,7 +220,7 @@ private void initZipImporter(PZipImporter self, String path) {
                 if (parentFile == null) {
                     break;
                 }
-                prefix = tfile.getName() + PZipImporter.SEPARATOR + prefix;
+                prefix = tfile.getName() + getContext().getEnv().getFileNameSeparator() + prefix;
                 tfile = parentFile;
             }
 
@@ -270,7 +269,7 @@ private void initZipImporter(PZipImporter self, String path) {
                             }
 
                             PTuple tuple = factory().createTuple(new Object[]{
-                                            tfile.getPath() + PZipImporter.SEPARATOR + entry.getName(),
+                                            tfile.getPath() + getContext().getEnv().getFileNameSeparator() + entry.getName(),
                                             // for our implementation currently we don't need these
                                             // these properties to store there. Keeping them for
                                             // compatibility.
@@ -388,7 +387,7 @@ public String doit(PZipImporter self) {
                 sb.append("???");
             } else if (prefix != null && !prefix.isEmpty()) {
                 sb.append(archive);
-                sb.append(File.pathSeparator);
+                sb.append(getContext().getEnv().getPathSeparator());
                 sb.append(prefix);
             } else {
                 sb.append(archive);
@@ -478,7 +477,7 @@ public PBytes doit(PZipImporter self, String pathname) {
             String archive = self.getArchive();
             int len = archive.length();
             int index = 0;
-            if (pathname.startsWith(archive) && pathname.charAt(len) == File.separatorChar) {
+            if (pathname.startsWith(archive) && pathname.substring(len).startsWith(getContext().getEnv().getFileNameSeparator())) {
                 index = len + 1;
             }
             String key = pathname.substring(index, pathname.length());

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -764,8 +764,8 @@ public PCode createCode(LazyPythonClass cls, RootCallTarget callTarget, Signatur
                         filename, name, firstlineno, lnotab));
     }
 
-    public PZipImporter createZipImporter(LazyPythonClass cls, PDict zipDirectoryCache) {
-        return trace(new PZipImporter(cls, zipDirectoryCache));
+    public PZipImporter createZipImporter(LazyPythonClass cls, PDict zipDirectoryCache, String separator) {
+        return trace(new PZipImporter(cls, zipDirectoryCache, separator));
     }
 
     /*