| 1 |
monsieurp 15/07/04 08:26:22 |
| 2 |
|
| 3 |
Added: bsf-2.4.0-PyJavaInstance.patch |
| 4 |
Log: |
| 5 |
EAPI 5 bump. dev-java/jython SLOT bump from :0 to :2.7. Patch to add missing imports due to jython:2.7 move. Drop ppc+ppc64. Fix bug 553892. |
| 6 |
|
| 7 |
Signed-off-by: Patrice Clement <monsieurp@g.o> |
| 8 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/bsf/files/bsf-2.4.0-PyJavaInstance.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: bsf-2.4.0-PyJavaInstance.patch |
| 17 |
=================================================================== |
| 18 |
--- src/org/apache/bsf/engines/jython/JythonEngine.java.orig 2015-07-04 08:00:17.120000000 +0000 |
| 19 |
+++ src/org/apache/bsf/engines/jython/JythonEngine.java 2015-07-04 08:04:55.230000000 +0000 |
| 20 |
@@ -26,7 +26,7 @@ |
| 21 |
import org.apache.bsf.util.BSFFunctions; |
| 22 |
import org.python.core.Py; |
| 23 |
import org.python.core.PyException; |
| 24 |
-import org.python.core.PyJavaInstance; |
| 25 |
+import org.python.core.PyJavaType; |
| 26 |
import org.python.core.PyObject; |
| 27 |
import org.python.util.InteractiveInterpreter; |
| 28 |
|
| 29 |
@@ -110,8 +110,9 @@ |
| 30 |
|
| 31 |
Object result = interp.eval ("bsf_temp_fn()"); |
| 32 |
|
| 33 |
- if (result != null && result instanceof PyJavaInstance) |
| 34 |
- result = ((PyJavaInstance)result).__tojava__(Object.class); |
| 35 |
+ if (result != null && result instanceof PyJavaType) |
| 36 |
+ //result = ((PyJavaInstance)result).__tojava__(Object.class); |
| 37 |
+ result = PyJavaType.wrapJavaObject(result).__tojava__(Object.class); |
| 38 |
return result; |
| 39 |
} catch (PyException e) { |
| 40 |
throw new BSFException (BSFException.REASON_EXECUTION_ERROR, |
| 41 |
@@ -126,8 +127,9 @@ |
| 42 |
Object script) throws BSFException { |
| 43 |
try { |
| 44 |
Object result = interp.eval (byteify(script.toString ())); |
| 45 |
- if (result != null && result instanceof PyJavaInstance) |
| 46 |
- result = ((PyJavaInstance)result).__tojava__(Object.class); |
| 47 |
+ if (result != null && result instanceof PyJavaType) |
| 48 |
+ //result = ((PyJavaInstance)result).__tojava__(Object.class); |
| 49 |
+ result = PyJavaType.wrapJavaObject(result).__tojava__(Object.class); |
| 50 |
return result; |
| 51 |
} catch (PyException e) { |
| 52 |
throw new BSFException (BSFException.REASON_EXECUTION_ERROR, |
Archives