ClasspathPyImporter implements get_data(); addresses #2058.

rjolly · rjolly · commit b6844ecf2b32 · 2013-09-26T11:21:58.000+02:00
diff --git a/src/org/python/core/ClasspathPyImporter.java b/src/org/python/core/ClasspathPyImporter.java
@@ -5,6 +5,8 @@
 import java.io.InputStream;
 import java.util.Map;
 
+import org.python.core.util.FileUtil;
+import org.python.core.util.StringUtil;
 import org.python.core.util.importer;
 import org.python.expose.ExposedMethod;
 import org.python.expose.ExposedNew;
@@ -40,6 +42,17 @@ final void ClasspathPyImporter___init__(PyObject[] args, String[] kwds) {
         this.path = path;
     }
 
+    public String get_data(String path) {
+        InputStream is = entries.get(makeEntry(path.replace("__pyclasspath__/", "")));
+        byte[] data;
+        try {
+            data = FileUtil.readBytes(is);
+        } catch (IOException ioe) {
+            throw Py.IOError(ioe);
+        }
+        return StringUtil.fromBytes(data);
+    }
+
     /**
      * Find the module for the fully qualified name.
      *
diff --git a/src/org/python/core/util/importer.java b/src/org/python/core/util/importer.java
@@ -39,6 +39,8 @@ public importer() {
         searchOrder = makeSearchOrder();
     }
 
+    public abstract String get_data(String path);
+
     /**
      * Returns the separator between directories and files used by this type of importer.
      */

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@ public importer() {`
`39`	`39`	`searchOrder = makeSearchOrder();`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ public abstract String get_data(String path);`
	`43`	`+`
`42`	`44`	`/**`
`43`	`45`	`* Returns the separator between directories and files used by this type of importer.`
`44`	`46`	`*/`