[Jython-checkins] CVS: jython/org/python/modules cPickle.java,1.12,1.13

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

Update of /cvsroot/jython/jython/org/python/modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv31209

Modified Files:
	cPickle.java 
Log Message:
Use the __import__ API in __builtin__.



Index: cPickle.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/cPickle.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** cPickle.java	2000/11/29 18:57:09	1.12
--- cPickle.java	2000/12/11 18:46:30	1.13
***************
*** 1991,2017 ****
  
      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;
      }
  }
--- 1991,1998 ----
  
      private static PyObject importModule(String name) {
          PyObject silly_list = new PyTuple(new PyString[] { 
              Py.newString("__doc__"),
          });
!         return __builtin__.__import__(name, null, null, silly_list);
      }
  }