Create the java proxy object after __init__ runs if it wasn't created by __init__

groves · groves · commit 33816de016b6 · 2008-11-23T23:46:11.000Z
diff --git a/src/org/python/core/PyArrayDerived.java b/src/org/python/core/PyArrayDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyBaseExceptionDerived.java b/src/org/python/core/PyBaseExceptionDerived.java
@@ -1069,6 +1069,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyBooleanDerived.java b/src/org/python/core/PyBooleanDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyClassMethodDerived.java b/src/org/python/core/PyClassMethodDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyComplexDerived.java b/src/org/python/core/PyComplexDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyDictionaryDerived.java b/src/org/python/core/PyDictionaryDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyEnumerateDerived.java b/src/org/python/core/PyEnumerateDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyFileDerived.java b/src/org/python/core/PyFileDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyFloatDerived.java b/src/org/python/core/PyFloatDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyFrozenSetDerived.java b/src/org/python/core/PyFrozenSetDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyIntegerDerived.java b/src/org/python/core/PyIntegerDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyJavaType.java b/src/org/python/core/PyJavaType.java
@@ -29,7 +29,7 @@ public PyJavaType() {
 
     @Override
     public Class<?> getProxyType() {
-        return underlying_class;
+        return PyObject.class.isAssignableFrom(underlying_class) ? null : underlying_class;
     }
 
     @Override
diff --git a/src/org/python/core/PyListDerived.java b/src/org/python/core/PyListDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyLongDerived.java b/src/org/python/core/PyLongDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyModuleDerived.java b/src/org/python/core/PyModuleDerived.java
@@ -1069,6 +1069,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyObject.java b/src/org/python/core/PyObject.java
@@ -101,8 +101,48 @@ public PyObject() {
      * Dispatch __init__ behavior
      */
     public void dispatch__init__(PyType type,PyObject[] args,String[] keywords) {
+        proxyInit();
     }
 
+    /**
+     * Attempts to automatically initialize our Java proxy if we have one and it wasn't initialized
+     * by our __init__.
+     */
+    protected void proxyInit() {
+        if (javaProxy != null || getType().getProxyType() == null) {
+            return;
+        }
+        Class<?> c = getType().getProxyType();
+        PyProxy proxy;
+        ThreadState ts = Py.getThreadState();
+        try {
+            ts.pushInitializingProxy(this);
+            try {
+                proxy = (PyProxy)c.newInstance();
+            } catch (java.lang.InstantiationException e) {
+                Class<?> sup = c.getSuperclass();
+                String msg = "Default constructor failed for Java superclass";
+                if (sup != null) {
+                    msg += " " + sup.getName();
+                }
+                throw Py.TypeError(msg);
+            } catch (NoSuchMethodError nsme) {
+                throw Py.TypeError("constructor requires arguments");
+            } catch (Exception exc) {
+                throw Py.JavaError(exc);
+            }
+        } finally {
+            ts.popInitializingProxy();
+        }
+        if (javaProxy != null && javaProxy != proxy) {
+            throw Py.TypeError("Proxy instance already initialized");
+        }
+        PyObject proxyInstance = proxy._getPyInstance();
+        if (proxyInstance != null && proxyInstance != this) {
+            throw Py.TypeError("Proxy initialized with another instance");
+        }
+        javaProxy = proxy;
+    }
 
     /**
      * Equivalent to the standard Python __repr__ method.  This method
diff --git a/src/org/python/core/PyObjectDerived.java b/src/org/python/core/PyObjectDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyPropertyDerived.java b/src/org/python/core/PyPropertyDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PySetDerived.java b/src/org/python/core/PySetDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PySliceDerived.java b/src/org/python/core/PySliceDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyStringDerived.java b/src/org/python/core/PyStringDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PySuperDerived.java b/src/org/python/core/PySuperDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyTupleDerived.java b/src/org/python/core/PyTupleDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyTypeDerived.java b/src/org/python/core/PyTypeDerived.java
@@ -1069,6 +1069,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/core/PyUnicodeDerived.java b/src/org/python/core/PyUnicodeDerived.java
@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/modules/_collections/PyDefaultDictDerived.java b/src/org/python/modules/_collections/PyDefaultDictDerived.java
@@ -1095,6 +1095,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/modules/_collections/PyDequeDerived.java b/src/org/python/modules/_collections/PyDequeDerived.java
@@ -1095,6 +1095,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/modules/_csv/PyDialectDerived.java b/src/org/python/modules/_csv/PyDialectDerived.java
@@ -1071,6 +1071,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/modules/_functools/PyPartialDerived.java b/src/org/python/modules/_functools/PyPartialDerived.java
@@ -1071,6 +1071,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/modules/_weakref/ReferenceTypeDerived.java b/src/org/python/modules/_weakref/ReferenceTypeDerived.java
@@ -1095,6 +1095,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/modules/random/PyRandomDerived.java b/src/org/python/modules/random/PyRandomDerived.java
@@ -1095,6 +1095,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/modules/thread/PyLocalDerived.java b/src/org/python/modules/thread/PyLocalDerived.java
@@ -1071,6 +1071,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/org/python/modules/zipimport/zipimporterDerived.java b/src/org/python/modules/zipimport/zipimporterDerived.java
@@ -1071,6 +1071,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {
                 }
             }
         }
+        proxyInit();
     }
 
     public PyObject __index__() {
diff --git a/src/templates/object.derived b/src/templates/object.derived
@@ -428,6 +428,7 @@ rest:
            }
          }
        }
+       proxyInit();
   }
 
   public PyObject __index__() {

Original file line number	Diff line number	Diff line change
`@@ -1093,6 +1093,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {`
`1093`	`1093`	`}`
`1094`	`1094`	`}`
`1095`	`1095`	`}`
	`1096`	`+ proxyInit();`
`1096`	`1097`	`}`
`1097`	`1098`
`1098`	`1099`	`public PyObject __index__() {`
Original file line number	Diff line number	Diff line change
`@@ -1069,6 +1069,7 @@ public void dispatch__init__(PyType type,PyObject[]args,String[]keywords) {`
`1069`	`1069`	`}`
`1070`	`1070`	`}`
`1071`	`1071`	`}`
	`1072`	`+ proxyInit();`
`1072`	`1073`	`}`
`1073`	`1074`
`1074`	`1075`	`public PyObject __index__() {`