JythonScriptLanguage: return null for None objects

ctrueden · ctrueden · commit fc67e550fccf · 2014-08-25T11:16:19.000-05:00
This avoids the following warning in the log:

[WARNING] Ignoring unsupported output: result [org.python.core.PyNone]
diff --git a/src/main/java/org/scijava/plugins/scripting/jython/JythonScriptLanguage.java b/src/main/java/org/scijava/plugins/scripting/jython/JythonScriptLanguage.java
@@ -33,6 +33,7 @@
 
 import javax.script.ScriptEngine;
 
+import org.python.core.PyNone;
 import org.scijava.plugin.Plugin;
 import org.scijava.script.AdaptedScriptLanguage;
 import org.scijava.script.ScriptLanguage;
@@ -56,4 +57,9 @@ public ScriptEngine getScriptEngine() {
 		return new JythonScriptEngine();
 	}
 
+	@Override
+	public Object decode(final Object object) {
+		return object instanceof PyNone ? null : object;
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`
`34`	`34`	`import javax.script.ScriptEngine;`
`35`	`35`
	`36`	`+import org.python.core.PyNone;`
`36`	`37`	`import org.scijava.plugin.Plugin;`
`37`	`38`	`import org.scijava.script.AdaptedScriptLanguage;`
`38`	`39`	`import org.scijava.script.ScriptLanguage;`
`@@ -56,4 +57,9 @@ public ScriptEngine getScriptEngine() {`
`56`	`57`	`return new JythonScriptEngine();`
`57`	`58`	`}`
`58`	`59`
	`60`	`+ @Override`
	`61`	`+ public Object decode(final Object object) {`
	`62`	`+ return object instanceof PyNone ? null : object;`
	`63`	`+ }`
	`64`	`+`
`59`	`65`	`}`