mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-06-03 03:57:32 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
--- src/org/apache/bsf/engines/jython/JythonEngine.java.orig 2015-07-04 08:00:17.120000000 +0000
|
|
+++ src/org/apache/bsf/engines/jython/JythonEngine.java 2015-07-04 08:04:55.230000000 +0000
|
|
@@ -26,7 +26,7 @@
|
|
import org.apache.bsf.util.BSFFunctions;
|
|
import org.python.core.Py;
|
|
import org.python.core.PyException;
|
|
-import org.python.core.PyJavaInstance;
|
|
+import org.python.core.PyJavaType;
|
|
import org.python.core.PyObject;
|
|
import org.python.util.InteractiveInterpreter;
|
|
|
|
@@ -110,8 +110,9 @@
|
|
|
|
Object result = interp.eval ("bsf_temp_fn()");
|
|
|
|
- if (result != null && result instanceof PyJavaInstance)
|
|
- result = ((PyJavaInstance)result).__tojava__(Object.class);
|
|
+ if (result != null && result instanceof PyJavaType)
|
|
+ //result = ((PyJavaInstance)result).__tojava__(Object.class);
|
|
+ result = PyJavaType.wrapJavaObject(result).__tojava__(Object.class);
|
|
return result;
|
|
} catch (PyException e) {
|
|
throw new BSFException (BSFException.REASON_EXECUTION_ERROR,
|
|
@@ -126,8 +127,9 @@
|
|
Object script) throws BSFException {
|
|
try {
|
|
Object result = interp.eval (byteify(script.toString ()));
|
|
- if (result != null && result instanceof PyJavaInstance)
|
|
- result = ((PyJavaInstance)result).__tojava__(Object.class);
|
|
+ if (result != null && result instanceof PyJavaType)
|
|
+ //result = ((PyJavaInstance)result).__tojava__(Object.class);
|
|
+ result = PyJavaType.wrapJavaObject(result).__tojava__(Object.class);
|
|
return result;
|
|
} catch (PyException e) {
|
|
throw new BSFException (BSFException.REASON_EXECUTION_ERROR,
|