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

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

Revision: 6851
          http://jython.svn.sourceforge.net/jython/?rev=6851&view=rev
Author:   pjenvey
Date:     2009-10-10 05:44:16 +0000 (Sat, 10 Oct 2009)

Log Message:
-----------
after a SystemRestart don't reset PySystemState until after the exitfuncs are
called, otherwise some strange problems can occur

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

Modified: trunk/jython/NEWS
===================================================================
--- trunk/jython/NEWS	2009-10-09 18:32:33 UTC (rev 6850)
+++ trunk/jython/NEWS	2009-10-10 05:44:16 UTC (rev 6851)
@@ -3,6 +3,8 @@
 Jython 2.5.2a1
   Bugs Fixed
     - [ 1478 ] defaultdict & weakref.WeakKeyDictionary [TypeError: first argument must be callable]
+    - Fix runtime issues during exitfuncs triggered via SystemRestart (such as
+      during Django or Pylons development mode reloading)
 
 Jython 2.5.1rc3
   Bugs Fixed

Modified: trunk/jython/src/org/python/util/jython.java
===================================================================
--- trunk/jython/src/org/python/util/jython.java	2009-10-09 18:32:33 UTC (rev 6850)
+++ trunk/jython/src/org/python/util/jython.java	2009-10-10 05:44:16 UTC (rev 6851)
@@ -254,9 +254,11 @@
                         // Shutdown this instance...
                         shouldRestart = true;
                         shutdownInterpreter();
+                        interp.cleanup();
                         // ..reset the state...
                         Py.setSystemState(new PySystemState());
                         // ...and start again
+                        return;
                     } else {
                         Py.printException(t);
                         if (!opts.interactive) {


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