From: brian z. <bz...@us...> - 2005-04-08 01:34:12
|
Update of /cvsroot/jython/jython/org/python/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28117/org/python/core Modified Files: Tag: pep302 imp.java Log Message: process the path prior to the meta_path traversal Index: imp.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/imp.java,v retrieving revision 2.65.2.3 retrieving revision 2.65.2.4 diff -C2 -d -r2.65.2.3 -r2.65.2.4 *** imp.java 5 Apr 2005 03:40:55 -0000 2.65.2.3 --- imp.java 8 Apr 2005 01:34:02 -0000 2.65.2.4 *************** *** 265,270 **** PySystemState sys = Py.getSystemState(); PyObject metaPath = sys.meta_path; - PyObject iter = metaPath.__iter__(); for(PyObject importer; (importer = iter.__iternext__()) != null;) { PyObject findModule = importer.__getattr__("find_module"); --- 265,284 ---- PySystemState sys = Py.getSystemState(); PyObject metaPath = sys.meta_path; + /* + Needed to convert all entries on the path to SyspathArchives if + necessary. + */ + PyList ppath = path == null ? sys.path : path; + for(int i=0;i<ppath.__len__();i++) { + PyObject p = ppath.__getitem__(i); + PyObject q = replacePathItem(p); + if(q == null) { + continue; + } + ppath.__setitem__(i, q); + } + + PyObject iter = metaPath.__iter__(); for(PyObject importer; (importer = iter.__iternext__()) != null;) { PyObject findModule = importer.__getattr__("find_module"); *************** *** 283,295 **** for(int i=0;i<path.__len__();i++) { PyObject p = path.__getitem__(i); - PyObject q = replacePathItem(p); - if(q == null) { - continue; - } - path.__setitem__(i, q); - } - - for(int i=0;i<path.__len__();i++) { - PyObject p = path.__getitem__(i); //System.err.println("find_module (" + name + ", " + moduleName + ") Path: " + path); PyObject importer = getPathImporter(sys.path_importer_cache, sys.path_hooks, p); --- 297,300 ---- |