[Jython-checkins] SF.net SVN: jython:[7178] trunk/jython

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

Revision: 7178
          http://jython.svn.sourceforge.net/jython/?rev=7178&view=rev
Author:   pjenvey
Date:     2010-12-24 23:23:05 +0000 (Fri, 24 Dec 2010)

Log Message:
-----------
fix exit code of 0 on unhandled exceptions in non-interactive mode
fixes #1682

Modified Paths:
--------------
    trunk/jython/NEWS
    trunk/jython/src/org/python/util/jython.java

Modified: trunk/jython/NEWS
===================================================================
--- trunk/jython/NEWS	2010-12-24 23:17:07 UTC (rev 7177)
+++ trunk/jython/NEWS	2010-12-24 23:23:05 UTC (rev 7178)
@@ -5,6 +5,8 @@
     - [ 1674 ] PDB crashes under the JSR-223 scripting engine
     - [ 1680 ] jython -c option is not parsed right
     - [ 1681 ] JSR-223, Jython 2.5.2 and implementing Java Interfaces from Python
+    - [ 1675 ] Jython exits prematurely when executing a file, thus killing Swing windows
+    - [ 1682 ] exit code of 0 on unhandled exception
       
 Jython 2.5.2rc2
   Bugs Fixed

Modified: trunk/jython/src/org/python/util/jython.java
===================================================================
--- trunk/jython/src/org/python/util/jython.java	2010-12-24 23:17:07 UTC (rev 7177)
+++ trunk/jython/src/org/python/util/jython.java	2010-12-24 23:23:05 UTC (rev 7178)
@@ -262,10 +262,8 @@
                         return;
                     } else {
                         Py.printException(t);
-                        if (!opts.interactive) {
-                            interp.cleanup();
-                            System.exit(-1);
-                        }
+                        interp.cleanup();
+                        System.exit(-1);
                     }
                 }
             }


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