JythonScriptLanguage: decode more PyObject types

It seems that for PyInteger at least, even though it is a PyObject, the
approach of calling __tojava__(getType().getProxyType()) does not work.

So to be safe, let's hardcode the types we _know_ we can support --
PyBoolean, PyInteger, PyFloat and PyString -- before PyObject generally.

Hopefully, this will prevent warnings such as:

    [WARNING] Ignoring unsupported output: result [org.python.core.PyInteger]

This change also updates the JythonTest#testBasic() method,
since the result is now an Integer rather than a PyInteger.

Author: ctrueden

src/main/java/org/scijava/plugins/scripting/jython/JythonScriptLanguage.java

@@ -33,6 +33,9 @@
 
 import javax.script.ScriptEngine;
 
+import org.python.core.PyBoolean;
+import org.python.core.PyFloat;
+import org.python.core.PyInteger;
 import org.python.core.PyNone;
 import org.python.core.PyObject;
 import org.python.core.PyString;
@@ -71,15 +74,24 @@ public ScriptEngine getScriptEngine() {
 	@Override
 	public Object decode(final Object object) {
 		if (object instanceof PyNone) return null;
+		if (object instanceof PyBoolean) {
+			return ((PyBoolean) object).getBooleanValue();
+		}
+		if (object instanceof PyInteger) {
+			return ((PyInteger) object).getValue();
+		}
+		if (object instanceof PyFloat) {
+			return ((PyFloat) object).getValue();
+		}
+		if (object instanceof PyString) {
+			return ((PyString) object).getString();
+		}
 		if (object instanceof PyObject) {
 			// Unwrap Python objects when they wrap Java ones.
 			final PyObject pyObj = (PyObject) object;
 			final Class<?> javaType = pyObj.getType().getProxyType();
 			if (javaType != null) return pyObj.__tojava__(javaType);
 		}
-		if (object instanceof PyString) {
-			return ((PyString) object).getString();
-		}
 		return object;
 	}
 

src/test/java/org/scijava/plugins/scripting/jython/JythonTest.java

@@ -33,6 +33,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
@@ -64,8 +65,8 @@ public void testBasic() throws InterruptedException, ExecutionException,
 		final String script = "1 + 2";
 		final ScriptModule m = scriptService.run("add.py", script, true).get();
 		final Object result = m.getReturnValue();
-		// NB: Result is of type org.python.core.PyInteger.
-		assertEquals("3", result.toString());
+		assertSame(Integer.class, result.getClass());
+		assertEquals(3, result);
 	}
 
 	@Test