Update of /cvsroot/jython/jython/org/python/util
In directory slayer.i.sourceforge.net:/tmp/cvs-serv32763
Modified Files:
PythonObjectInputStream.java
Log Message:
Use the __builtin__.__import__() API.
Index: PythonObjectInputStream.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/util/PythonObjectInputStream.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** PythonObjectInputStream.java 2000/11/29 19:39:27 1.5
--- PythonObjectInputStream.java 2000/12/11 18:57:03 1.6
***************
*** 49,75 ****
private static PyObject importModule(String name) {
- PyFrame frame = Py.getFrame();
- if (frame == null)
- return null;
- PyObject globals = frame.f_globals;
-
- PyObject builtins = frame.f_builtins;
- if (builtins == null)
- builtins = Py.getSystemState().builtins;
-
PyObject silly_list = new PyTuple(new PyString[] {
Py.newString("__doc__"),
});
!
! PyObject __import__ = builtins.__finditem__("__import__");
! if (__import__ == null)
! return null;
!
! PyObject module = __import__.__call__(new PyObject[] {
! Py.newString(name),
! globals,
! globals,
! silly_list } );
! return module;
}
}
--- 49,56 ----
private static PyObject importModule(String name) {
PyObject silly_list = new PyTuple(new PyString[] {
Py.newString("__doc__"),
});
! return __builtin__.__import__(name, null, null, silly_list);
}
}
|
