[Jython-checkins] CVS: jython/org/python/core __builtin__.java,2.40,2.41

[Samuele P. <ped...@us...>]

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

Modified Files:
	__builtin__.java 
Log Message:
Fix for [ #484949 ] __import__(_) does unwanted rel search.



Index: __builtin__.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/__builtin__.java,v
retrieving revision 2.40
retrieving revision 2.41
diff -C2 -d -r2.40 -r2.41
*** __builtin__.java	2001/12/16 13:04:02	2.40
--- __builtin__.java	2001/12/20 22:45:11	2.41
***************
*** 1007,1021 ****
  
          PyObject globals = (argc > 1 && args[1] != null)
!             ? args[1] : __builtin__.globals();
!         PyObject locals = (argc > 2 && args[2] != null)
!             ? args[2] : __builtin__.locals();
          PyObject fromlist = (argc > 3 && args[3] != null)
              ? args[3] : Py.EmptyTuple;
  
!         return load(module, globals, locals, fromlist);
      }
  
      private PyObject load(String module,
!                           PyObject globals, PyObject locals,
                            PyObject fromlist)
      {
--- 1007,1019 ----
  
          PyObject globals = (argc > 1 && args[1] != null)
!             ? args[1] : null;
          PyObject fromlist = (argc > 3 && args[3] != null)
              ? args[3] : Py.EmptyTuple;
  
!         return load(module, globals, fromlist);
      }
  
      private PyObject load(String module,
!                           PyObject globals,
                            PyObject fromlist)
      {