jython-checkins

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

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

Modified Files:
	__builtin__.java 
Log Message:
Added notes about current situation vs. CPython (relevant for 2.2 stuff)
__builtin__.type changed to work with PyMetaClass hook.


Index: __builtin__.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/__builtin__.java,v
retrieving revision 2.35
retrieving revision 2.36
diff -C2 -d -r2.35 -r2.36
*** __builtin__.java	2001/07/18 15:53:56	2.35
--- __builtin__.java	2001/08/08 18:15:38	2.36
***************
*** 862,866 ****
      public static PyClass type(PyObject o) {
          if (o instanceof PyInstance) {
!             return PyJavaClass.lookup(PyInstance.class);
          } else {
              return o.__class__;
--- 862,866 ----
      public static PyClass type(PyObject o) {
          if (o instanceof PyInstance) {
!             return PyJavaClass.lookup(o.getClass()); // was just PyInstance.class, goes with experimental PyMetaClass hook
          } else {
              return o.__class__;