Clean up

Author: qunaibit

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

@@ -409,10 +409,6 @@ private static LZMAOutputStream createLZMAOutputStream(ByteArrayOutputStream bos
     @TypeSystemReference(PythonArithmeticTypes.class)
     abstract static class LZMADecompressorNode extends LZMANode {
 
-        @Child private GetItemNode getItemNode;
-
-        @Child private IsBuiltinClassProfile keyErrorProfile;
-
         @Specialization
         PLZMADecompressor doCreate(VirtualFrame frame, Object cls, Object formatObj, Object memlimitObj, Object filters,
                         @CachedLibrary(limit = "2") PythonObjectLibrary lib) {

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

@@ -37,7 +37,6 @@
 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.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.object.Shape;
 
@@ -214,8 +213,8 @@ protected String makePackagePath(String fullname) {
      * @return code
      * @throws IOException
      */
-    @CompilerDirectives.TruffleBoundary
-    private String getCode(String filenameAndSuffix) throws IOException {
+    @TruffleBoundary
+    public static String getCodeFromArchive(String filenameAndSuffix, String archive) throws IOException {
         ZipFile zip = null;
         try {
             zip = new ZipFile(archive);
@@ -237,7 +236,7 @@ private String getCode(String filenameAndSuffix) throws IOException {
             reader.close();
             return code.toString();
         } catch (IOException e) {
-            throw new IOException("Can not read code from " + makePackagePath(filenameAndSuffix), e);
+            throw e;
         } finally {
             if (zip != null) {
                 try {
@@ -323,8 +322,12 @@ protected final ModuleCodeData getModuleCode(String fullname) throws IOException
 
             boolean isPackage = entry.type.contains(EntryType.IS_PACKAGE);
 
-            String code = "";
-            code = getCode(searchPath);
+            String code;
+            try {
+                code = getCodeFromArchive(searchPath, archive);
+            } catch (IOException e) {
+                throw new IOException("Can not read code from " + makePackagePath(searchPath), e);
+            }
             return new ModuleCodeData(code, isPackage, fullSearchPath);
         }
         return null;