[Jython-checkins] CVS: jython/org/python/core Py.java,2.70,2.71

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

Update of /cvsroot/jython/jython/org/python/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv975/org/python/core

Modified Files:
	Py.java 
Log Message:
fix for #625391 traceback.print_exc, make test382 pass

Index: Py.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/Py.java,v
retrieving revision 2.70
retrieving revision 2.71
diff -C2 -d -r2.70 -r2.71
*** Py.java	6 Aug 2003 11:46:26 -0000	2.70
--- Py.java	27 Jan 2004 19:30:00 -0000	2.71
***************
*** 927,934 ****
          maybeSystemExit(exc);
  
-         if (f != null && exc.traceback.tb_frame != f) {
-             exc.traceback = new PyTraceback(exc.traceback);
-         }
- 
          setException(exc, f);
  
--- 927,930 ----
***************
*** 1040,1049 ****
          pye.instantiate();
  
          ThreadState ts = getThreadState();
  
          ts.exception = pye;
!         /*.type;
!           ts.exc_value = pye.value;
!           ts.exc_traceback = pye.traceback;*/
          return pye;
      }
--- 1036,1048 ----
          pye.instantiate();
  
+         // attach catching frame
+         if (frame != null && pye.traceback.tb_frame != frame) {
+             pye.traceback = new PyTraceback(pye.traceback);
+         }
+        
          ThreadState ts = getThreadState();
  
          ts.exception = pye;
! 
          return pye;
      }