Index: PathPackageManager.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PathPackageManager.java,v retrieving revision 1.5 diff -c -r1.5 PathPackageManager.java *** PathPackageManager.java 2001/10/28 17:13:42 1.5 --- PathPackageManager.java 2001/11/06 16:34:31 *************** *** 30,36 **** String dir = path.get(i).__str__().toString(); if (dir.length() == 0) dir = null; ! if (new File(dir,child).isDirectory()) return true; } return false; } --- 30,38 ---- String dir = path.get(i).__str__().toString(); if (dir.length() == 0) dir = null; ! File f = new File(dir,child); ! if (f.isDirectory() && imp.caseok(f, name, name.length())) ! return true; } return false; } Index: PyJavaPackage.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyJavaPackage.java,v retrieving revision 2.16 diff -c -r2.16 PyJavaPackage.java *** PyJavaPackage.java 2001/10/28 17:13:43 2.16 --- PyJavaPackage.java 2001/11/06 16:34:32 *************** *** 135,146 **** PyObject ret = __dict__.__finditem__(name); if (ret != null) return ret; - Class c; - - c = __mgr__.findClass(__name__,name); - - if (c != null) return addClass(name,c); - if (name == "__name__") return new PyString(__name__); if (name == "__dict__") return __dict__; if (name == "__mgr__") return Py.java2py(__mgr__); --- 135,140 ---- *************** *** 154,159 **** --- 148,156 ---- __mgr__.notifyPackageImport(__name__,name); return addPackage(name); } + + Class c = __mgr__.findClass(__name__,name); + if (c != null) return addClass(name,c); return null; } Index: imp.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/imp.java,v retrieving revision 2.54 diff -c -r2.54 imp.java *** imp.java 2001/10/28 17:13:43 2.54 --- imp.java 2001/11/06 16:34:34 *************** *** 453,459 **** return null; } ! private static boolean caseok(File file, String filename, int namelen) { if (Options.caseok) return true; try { --- 453,459 ---- return null; } ! static boolean caseok(File file, String filename, int namelen) { if (Options.caseok) return true; try {