Fix: do not throw RuntimeException on I/O error.

Author: fangerer

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

@@ -25,13 +25,6 @@
  */
 package com.oracle.graal.python.builtins.objects.zipimporter;
 
-import com.oracle.graal.python.builtins.objects.dict.PDict;
-import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
-import com.oracle.graal.python.builtins.objects.tuple.PTuple;
-import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
-import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -41,6 +34,13 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
+import com.oracle.graal.python.builtins.objects.dict.PDict;
+import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
+import com.oracle.graal.python.builtins.objects.tuple.PTuple;
+import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+
 public class PZipImporter extends PythonBuiltinObject {
 
     public static final String SEPARATOR = File.separator;
@@ -197,9 +197,10 @@ protected String makePackagePath(String fullname) {
      *
      * @param filenameAndSuffix
      * @return code
+     * @throws IOException
      */
     @CompilerDirectives.TruffleBoundary
-    private String getCode(String filenameAndSuffix) {
+    private String getCode(String filenameAndSuffix) throws IOException {
         ZipFile zip = null;
         try {
             zip = new ZipFile(archive);
@@ -221,7 +222,7 @@ private String getCode(String filenameAndSuffix) {
             reader.close();
             return code.toString();
         } catch (IOException e) {
-            throw new RuntimeException("Can not read code from " + makePackagePath(filenameAndSuffix), e);
+            throw new IOException("Can not read code from " + makePackagePath(filenameAndSuffix), e);
         } finally {
             if (zip != null) {
                 try {
@@ -271,7 +272,7 @@ protected final PZipImporter findModule(String fullname) {
     }
 
     @TruffleBoundary
-    protected final ModuleCodeData getModuleCode(String fullname) {
+    protected final ModuleCodeData getModuleCode(String fullname) throws IOException {
         String path = makeFilename(fullname);
         String fullPath = makePackagePath(fullname);
 

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

@@ -50,6 +50,7 @@
 import com.oracle.graal.python.builtins.objects.code.PCode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
+import com.oracle.graal.python.builtins.objects.exception.OSErrorEnum;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
@@ -445,7 +446,12 @@ public PCode doit(VirtualFrame frame, PZipImporter self, String fullname,
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 compileNode = insert(CompileNode.create(false));
             }
-            ModuleCodeData md = self.getModuleCode(fullname);
+            ModuleCodeData md;
+            try {
+                md = self.getModuleCode(fullname);
+            } catch (IOException e) {
+                throw raiseOSError(frame, OSErrorEnum.EIO, e);
+            }
             if (canNotFind.profile(md == null)) {
                 throw raise(PythonErrorType.ZipImportError, " can't find module '%s'", fullname);
             }
@@ -529,13 +535,18 @@ public PBytes doit(PZipImporter self, String pathname) {
     public abstract static class GetFileNameNode extends PythonBinaryBuiltinNode {
 
         @Specialization
-        public Object doit(PZipImporter self, String fullname,
+        public Object doit(VirtualFrame frame, PZipImporter self, String fullname,
                         @Cached("createBinaryProfile()") ConditionProfile canNotFind,
                         @Cached("createBinaryProfile()") ConditionProfile initWasNotCalled) {
             if (initWasNotCalled.profile(self.getPrefix() == null)) {
                 throw raise(PythonErrorType.ValueError, INIT_WAS_NOT_CALLED);
             }
-            ModuleCodeData moduleCodeData = self.getModuleCode(fullname);
+            ModuleCodeData moduleCodeData;
+            try {
+                moduleCodeData = self.getModuleCode(fullname);
+            } catch (IOException e) {
+                throw raiseOSError(frame, OSErrorEnum.EIO, e);
+            }
             if (canNotFind.profile(moduleCodeData == null)) {
                 throw raise(PythonErrorType.ZipImportError, " can't find module '%s'", fullname);
             }
@@ -550,13 +561,18 @@ public Object doit(PZipImporter self, String fullname,
     public abstract static class GetSourceNode extends PythonBinaryBuiltinNode {
 
         @Specialization
-        public String doit(PZipImporter self, String fullname,
+        public String doit(VirtualFrame frame, PZipImporter self, String fullname,
                         @Cached("createBinaryProfile()") ConditionProfile canNotFind,
                         @Cached("createBinaryProfile()") ConditionProfile initWasNotCalled) {
             if (initWasNotCalled.profile(self.getPrefix() == null)) {
                 throw raise(PythonErrorType.ValueError, INIT_WAS_NOT_CALLED);
             }
-            ModuleCodeData md = self.getModuleCode(fullname);
+            ModuleCodeData md;
+            try {
+                md = self.getModuleCode(fullname);
+            } catch (IOException e) {
+                throw raiseOSError(frame, OSErrorEnum.EIO, e);
+            }
             if (canNotFind.profile(md == null)) {
                 throw raise(PythonErrorType.ZipImportError, "can't find module '%s'", fullname);
             }