2 new revisions:
Revision: a84601769d1b
Branch: default
Author: Jussi Malinen <[email protected]>
Date: Mon Jan 7 04:10:37 2013
Log: Revert change 00342e052b17 to fix sshlibrary on standalone jar....
http://code.google.com/p/robotframework/source/detail?r=a84601769d1b
Revision: 1cb1c79e28e1
Branch: default
Author: Jussi Malinen <[email protected]>
Date: Mon Jan 7 04:10:52 2013
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=1cb1c79e28e1
==============================================================================
Revision: a84601769d1b
Branch: default
Author: Jussi Malinen <[email protected]>
Date: Mon Jan 7 04:10:37 2013
Log: Revert change 00342e052b17 to fix sshlibrary on standalone jar.
Update issue 1311
Status: Done
Revert change 00342e052b17 to fix sshlibrary on standalone jar.
http://code.google.com/p/robotframework/source/detail?r=a84601769d1b
Modified:
/src/java/org/robotframework/RunnerFactory.java
=======================================
--- /src/java/org/robotframework/RunnerFactory.java Tue Mar 6 00:46:30 2012
+++ /src/java/org/robotframework/RunnerFactory.java Mon Jan 7 04:10:37 2013
@@ -16,7 +16,6 @@
package org.robotframework;
import org.python.core.PyObject;
-import org.python.core.PySystemState;
import org.python.util.PythonInterpreter;
/**
@@ -34,7 +33,7 @@
}
private PyObject importRunnerClass() {
- PythonInterpreter interpreter = new PythonInterpreter(null, new
PySystemState());
+ PythonInterpreter interpreter = new PythonInterpreter();
interpreter.exec("import robot; from robot.jarrunner import
JarRunner");
return interpreter.get("JarRunner");
}
==============================================================================
Revision: 1cb1c79e28e1
Branch: default
Author: Jussi Malinen <[email protected]>
Date: Mon Jan 7 04:10:52 2013
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=1cb1c79e28e1
