mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-10-09 09:59:04 -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
23 lines
1.0 KiB
Diff
23 lines
1.0 KiB
Diff
--- 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;
|