monsieurp 15/07/05 08:16:30 Added: freemarker-2.3.13-PyJavaInstance.patch Log: 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. Fix bug 553900. Signed-off-by: Patrice Clement <[email protected]> (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Revision Changes Path 1.1 dev-java/freemarker/files/freemarker-2.3.13-PyJavaInstance.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/freemarker/files/freemarker-2.3.13-PyJavaInstance.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/freemarker/files/freemarker-2.3.13-PyJavaInstance.patch?rev=1.1&content-type=text/plain Index: freemarker-2.3.13-PyJavaInstance.patch =================================================================== --- src/freemarker/ext/jython/JythonModelCache.java.orig 2015-07-05 08:47:07.035000000 +0000 +++ src/freemarker/ext/jython/JythonModelCache.java 2015-07-05 08:49:31.157000000 +0000 @@ -10,7 +10,7 @@ import org.python.core.PyDictionary; import org.python.core.PyFloat; import org.python.core.PyInteger; -import org.python.core.PyJavaInstance; +import org.python.core.PyJavaType; import org.python.core.PyLong; import org.python.core.PyNone; import org.python.core.PyObject; @@ -37,8 +37,8 @@ protected TemplateModel create(Object obj) { boolean asHash = false; boolean asSequence = false; - if(obj instanceof PyJavaInstance) { - Object jobj = ((PyJavaInstance)obj).__tojava__(java.lang.Object.class); + if(obj instanceof PyJavaType) { + Object jobj = PyJavaType.wrapJavaObject(obj).__tojava__(Object.class); // FreeMarker-aware, Jython-wrapped Java objects are left intact if(jobj instanceof TemplateModel) { return (TemplateModel)jobj;
