jython-checkins

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv13523

Modified Files:
	imp.java 
Log Message:
Use the relative module name when adding a subdir zip archive.

This fixes "[ #495458 ] multi level import from .zip file".



Index: imp.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/imp.java,v
retrieving revision 2.57
retrieving revision 2.58
diff -C2 -d -r2.57 -r2.58
*** imp.java	2001/11/27 19:07:21	2.57
--- imp.java	2001/12/20 16:44:06	2.58
***************
*** 299,303 ****
                  PyModule m = addModule(modName);
  
!                 SyspathArchive subArchive = zipArchive.makeSubfolder(modName);
                  PyList zipPath = new PyList(new PyObject[] { subArchive });
                  m.__dict__.__setitem__("__path__", zipPath);
--- 299,303 ----
                  PyModule m = addModule(modName);
  
!                 SyspathArchive subArchive = zipArchive.makeSubfolder(name);
                  PyList zipPath = new PyList(new PyObject[] { subArchive });
                  m.__dict__.__setitem__("__path__", zipPath);