[Jython-checkins] SF.net SVN: jython:[6561] branches/jsr223/src/org/python

[<nr...@us...>]

Revision: 6561
          http://jython.svn.sourceforge.net/jython/?rev=6561&view=rev
Author:   nriley
Date:     2009-07-22 23:52:00 +0000 (Wed, 22 Jul 2009)

Log Message:
-----------
JSR 223: set PySystemState for separate compile/execute.

Modified Paths:
--------------
    branches/jsr223/src/org/python/jsr223/PyScriptEngine.java
    branches/jsr223/src/org/python/util/PythonInterpreter.java

Modified: branches/jsr223/src/org/python/jsr223/PyScriptEngine.java
===================================================================
--- branches/jsr223/src/org/python/jsr223/PyScriptEngine.java	2009-07-22 23:51:47 UTC (rev 6560)
+++ branches/jsr223/src/org/python/jsr223/PyScriptEngine.java	2009-07-22 23:52:00 UTC (rev 6561)
@@ -164,9 +164,11 @@
 
     private class PyCompiledScript extends CompiledScript {
         private PyCode code;
+        private PySystemState systemState;
 
         PyCompiledScript(PyCode code) {
             this.code = code;
+            this.systemState = Py.getSystemState();
         }
 
         public ScriptEngine getEngine() {
@@ -175,6 +177,7 @@
 
         public Object eval(ScriptContext ctx) throws ScriptException {
             // can't read filename from context at this point
+            Py.setSystemState(systemState);
             return PyScriptEngine.this.eval(code);
         }
     }

Modified: branches/jsr223/src/org/python/util/PythonInterpreter.java
===================================================================
--- branches/jsr223/src/org/python/util/PythonInterpreter.java	2009-07-22 23:51:47 UTC (rev 6560)
+++ branches/jsr223/src/org/python/util/PythonInterpreter.java	2009-07-22 23:52:00 UTC (rev 6561)
@@ -199,6 +199,7 @@
     }
     public PyCode compile(Reader reader, String filename) {
         mod node = ParserFacade.parseExpressionOrModule(reader, filename, cflags);
+        setState();
         return Py.compile_flags(node, filename, CompileMode.eval, cflags);
     }
 


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