Index: org/python/core/PyJavaPackage.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyJavaPackage.java,v
retrieving revision 2.17
diff -u -r2.17 PyJavaPackage.java
--- org/python/core/PyJavaPackage.java	21 Dec 2001 00:18:12 -0000	2.17
+++ org/python/core/PyJavaPackage.java	10 Sep 2002 17:15:36 -0000
@@ -48,7 +48,7 @@
         __name__ = name;
 
         if( mgr == null )
-           __mgr__ = PySystemState.packageManager; // default
+           __mgr__ = Py.getSystemState().packageManager; // default
         else
            __mgr__ = mgr;
 
Index: org/python/core/PyModule.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyModule.java,v
retrieving revision 2.14
diff -u -r2.14 PyModule.java
--- org/python/core/PyModule.java	27 Nov 2001 13:51:37 -0000	2.14
+++ org/python/core/PyModule.java	10 Sep 2002 17:15:36 -0000
@@ -40,7 +40,7 @@
         }
 
         if (ret == null) {
-            ret = PySystemState.packageManager.lookupName(fullName);
+            ret = Py.getSystemState().packageManager.lookupName(fullName);
         }
 
         if (ret != null) {
Index: org/python/core/PySystemState.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PySystemState.java,v
retrieving revision 2.76
diff -u -r2.76 PySystemState.java
--- org/python/core/PySystemState.java	31 May 2002 12:17:46 -0000	2.76
+++ org/python/core/PySystemState.java	10 Sep 2002 17:15:35 -0000
@@ -203,6 +203,15 @@
         initialize();
         modules = new PyStringMap();
 
+        File pkgdir;
+        if (cachedir != null) {
+            pkgdir = new File(cachedir, "packages");
+        } else {
+            pkgdir = null;
+        }
+        packageManager = new SysPackageManager(pkgdir, registry);
+
+
         argv = (PyList)defaultArgv.repeat(1);
         path = (PyList)defaultPath.repeat(1);
 
@@ -432,7 +441,7 @@
                             Py.newInteger(PY_RELEASE_SERIAL) });
     }
 
-    public static PackageManager packageManager;
+    public PackageManager packageManager;
     public static File cachedir;
 
     private static void initCacheDirectory(Properties props) {
@@ -448,13 +457,6 @@
 
     private static void initPackages(Properties props) {
         initCacheDirectory(props);
-        File pkgdir;
-        if (cachedir != null) {
-            pkgdir = new File(cachedir, "packages");
-        } else {
-            pkgdir = null;
-        }
-        packageManager = new SysPackageManager(pkgdir, props);
     }
 
     private static PyList initArgv(String[] args) {
@@ -545,7 +547,7 @@
     }
 
     public static PyJavaPackage add_package(String n, String contents) {
-        return packageManager.makeJavaPackage(n, contents, null);
+        return Py.getSystemState().packageManager.makeJavaPackage(n, contents, null);
     }
 
     /**
@@ -563,7 +565,7 @@
      * context classloader.
      */
     public static void add_classdir(String directoryPath) {
-        packageManager.addDirectory(new File(directoryPath));
+        Py.getSystemState().packageManager.addDirectory(new File(directoryPath));
     }
 
     /**
@@ -580,7 +582,7 @@
      * @see #add_classdir
      */
     public static void add_extdir(String directoryPath) {
-        packageManager.addJarDir(directoryPath, false);
+        Py.getSystemState().packageManager.addJarDir(directoryPath, false);
     }
 
     /**
@@ -598,7 +600,7 @@
      * @see #add_classdir
      */
     public static void add_extdir(String directoryPath, boolean cache) {
-        packageManager.addJarDir(directoryPath, cache);
+        Py.getSystemState().packageManager.addJarDir(directoryPath, cache);
     }
 
     public TraceFunction tracefunc = null;
Index: org/python/core/imp.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/imp.java,v
retrieving revision 2.63
diff -u -r2.63 imp.java
--- org/python/core/imp.java	30 May 2002 19:20:29 -0000	2.63
+++ org/python/core/imp.java	10 Sep 2002 17:15:36 -0000
@@ -491,7 +491,7 @@
         if (ret != null) return ret;
 
         Py.writeDebug("import", "trying " + name + " in packagemanager");
-        ret = PySystemState.packageManager.lookupName(name);
+        ret = Py.getSystemState().packageManager.lookupName(name);
         if (ret != null) {
             Py.writeComment("import", "'" + name + "' as java package");
             return ret;