Update of /cvsroot/jython/jython/org/python/core
In directory usw-pr-cvs1:/tmp/cvs-serv492
Modified Files:
imp.java
Log Message:
importAll(): Don't look for __all__ in java packages. Compiled applets
don't like that at all.
Index: imp.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/imp.java,v
retrieving revision 2.40
retrieving revision 2.41
diff -C2 -r2.40 -r2.41
*** imp.java 2001/02/25 16:52:54 2.40
--- imp.java 2001/03/14 13:47:53 2.41
***************
*** 617,622 ****
if (module instanceof PyJavaPackage)
names = ((PyJavaPackage)module).fillDir();
! else
! names = module.__dir__();
loadNames(names, module, frame.getf_locals());
--- 617,624 ----
if (module instanceof PyJavaPackage)
names = ((PyJavaPackage)module).fillDir();
! else {
! PyObject __all__ = module.__findattr__("__all__");
! names = (__all__ != null) ? __all__ : module.__dir__();
! }
loadNames(names, module, frame.getf_locals());
***************
*** 626,631 ****
PyObject locals)
{
- PyObject __all__ = module.__findattr__("__all__");
- if (__all__ != null) names = __all__;
int i=0;
PyObject name;
--- 628,631 ----
|
