Index: core/PySystemState.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PySystemState.java,v
retrieving revision 2.62
diff -u -r2.62 PySystemState.java
--- core/PySystemState.java	2001/08/19 21:21:40	2.62
+++ core/PySystemState.java	2001/08/22 19:48:59
@@ -433,6 +433,10 @@
             cachedir = null;
             return;
         }
+        if ("true".equals(props.getProperty("python.skipcachedir"))) {
+            cachedir = null;
+            return;
+        }
         cachedir = new File(props.getProperty("python.cachedir", "cachedir"));
         if (!cachedir.isAbsolute()) {
             cachedir = new File(PySystemState.prefix, cachedir.getPath());
Index: core/SysPackageManager.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/SysPackageManager.java,v
retrieving revision 1.8
diff -u -r1.8 SysPackageManager.java
--- core/SysPackageManager.java	2001/07/25 19:58:07	1.8
+++ core/SysPackageManager.java	2001/08/22 19:49:00
@@ -133,6 +133,22 @@
             return true;
         }
 
+        String p = pkg.length() > 0 ? pkg + "." + name : name;
+
+        InputStream is = getClass().getResourceAsStream(
+                                        "/META-INF/JYTHON-PACKAGE-" + p);
+        if (is != null) {
+            String classes = null;
+            try {
+                DataInputStream dis = new DataInputStream(is);
+                classes = dis.readUTF();
+                dis.close();
+            } catch (IOException exc) {
+                return false;
+            }
+            makeJavaPackage(p, classes, null);
+            return true;
+        }
         return false;
     }
 
cvs server: Diffing modules
cvs server: Diffing modules/sre
cvs server: Diffing parser
cvs server: Diffing rmi
cvs server: Diffing util