[Jython-checkins] CVS: jython/org/python/core PyClass.java,2.24,2.25

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

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

Modified Files:
	PyClass.java 
Log Message:
init(): Make the process of updating based on the __supername__ dict
a little more robust. Needed reverting the fix for bug #122819.



Index: PyClass.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyClass.java,v
retrieving revision 2.24
retrieving revision 2.25
diff -C2 -r2.24 -r2.25
*** PyClass.java	2001/04/25 18:39:24	2.24
--- PyClass.java	2001/05/07 19:15:56	2.25
***************
*** 135,140 ****
                  PyObject sname;
                  for (int i = 0; (sname = snames.__finditem__(i)) != null; i++) {
!                     if (__dict__.__finditem__(sname) == null)
!                         __dict__.__setitem__(sname, superDict.__getitem__(sname));
                  }
              }
--- 135,143 ----
                  PyObject sname;
                  for (int i = 0; (sname = snames.__finditem__(i)) != null; i++) {
!                     if (__dict__.__finditem__(sname) == null) {
!                         PyObject superFunc = superDict.__finditem__(sname);
!                         if (superFunc != null)
!                             __dict__.__setitem__(sname, superFunc);
!                     }
                  }
              }