[Jython-checkins] SF.net SVN: jython:[5505] trunk/jython/src/org/python/core/PyGenerator.java

[<pj...@us...>]

Revision: 5505
          http://jython.svn.sourceforge.net/jython/?rev=5505&view=rev
Author:   pjenvey
Date:     2008-10-24 00:48:16 +0000 (Fri, 24 Oct 2008)

Log Message:
-----------
have throw take a PyObject traceback to fix the bad bytecode generated for its
exposer

Modified Paths:
--------------
    trunk/jython/src/org/python/core/PyGenerator.java

Modified: trunk/jython/src/org/python/core/PyGenerator.java
===================================================================
--- trunk/jython/src/org/python/core/PyGenerator.java	2008-10-22 08:27:42 UTC (rev 5504)
+++ trunk/jython/src/org/python/core/PyGenerator.java	2008-10-24 00:48:16 UTC (rev 5505)
@@ -40,7 +40,12 @@
     }
 
     @ExposedMethod(names="throw", defaults={"null", "null"})
-    public PyObject throw$(PyObject type, PyObject value, PyTraceback tb) {
+    public PyObject throw$(PyObject type, PyObject value, PyObject tb) {
+        if (tb == Py.None) {
+            tb = null;
+        } else if (tb != null && !(tb instanceof PyTraceback)) {
+            throw Py.TypeError("throw() third argument must be a traceback object");
+        }
         return raiseException(Py.makeException(type, value, tb));
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.