[Jython-checkins] jython: Modified __ensure_finalizer__ to work without using reflection and added some
jim.baker
jython-checkins at python.org
Thu Sep 4 06:35:44 CEST 2014
http://hg.python.org/jython/rev/54f36c4c72d1
changeset: 7364:54f36c4c72d1
parent: 7362:5397c1f405c5
user: Stefan Richthofer <stefan.richthofer at gmx.de>
date: Thu Aug 28 06:06:02 2014 +0200
summary:
Modified __ensure_finalizer__ to work without using reflection and added some paragraphs to the documentation in FinalizablePyObject (stating use cases fo __ensure_finalizer__ and specifying that it is not possible to overwrite __ensure_finalizer__ on Python side).
files:
src/org/python/antlr/ast/AssertDerived.java | 2 +-
src/org/python/antlr/ast/AssignDerived.java | 2 +-
src/org/python/antlr/ast/AttributeDerived.java | 2 +-
src/org/python/antlr/ast/AugAssignDerived.java | 2 +-
src/org/python/antlr/ast/BinOpDerived.java | 2 +-
src/org/python/antlr/ast/BoolOpDerived.java | 2 +-
src/org/python/antlr/ast/BreakDerived.java | 2 +-
src/org/python/antlr/ast/CallDerived.java | 2 +-
src/org/python/antlr/ast/ClassDefDerived.java | 2 +-
src/org/python/antlr/ast/CompareDerived.java | 2 +-
src/org/python/antlr/ast/ContinueDerived.java | 2 +-
src/org/python/antlr/ast/DeleteDerived.java | 2 +-
src/org/python/antlr/ast/DictDerived.java | 2 +-
src/org/python/antlr/ast/EllipsisDerived.java | 2 +-
src/org/python/antlr/ast/ExceptHandlerDerived.java | 2 +-
src/org/python/antlr/ast/ExecDerived.java | 2 +-
src/org/python/antlr/ast/ExprDerived.java | 2 +-
src/org/python/antlr/ast/ExpressionDerived.java | 2 +-
src/org/python/antlr/ast/ExtSliceDerived.java | 2 +-
src/org/python/antlr/ast/ForDerived.java | 2 +-
src/org/python/antlr/ast/FunctionDefDerived.java | 2 +-
src/org/python/antlr/ast/GeneratorExpDerived.java | 2 +-
src/org/python/antlr/ast/GlobalDerived.java | 2 +-
src/org/python/antlr/ast/IfDerived.java | 2 +-
src/org/python/antlr/ast/IfExpDerived.java | 2 +-
src/org/python/antlr/ast/ImportDerived.java | 2 +-
src/org/python/antlr/ast/ImportFromDerived.java | 2 +-
src/org/python/antlr/ast/IndexDerived.java | 2 +-
src/org/python/antlr/ast/InteractiveDerived.java | 2 +-
src/org/python/antlr/ast/LambdaDerived.java | 2 +-
src/org/python/antlr/ast/ListCompDerived.java | 2 +-
src/org/python/antlr/ast/ListDerived.java | 2 +-
src/org/python/antlr/ast/ModuleDerived.java | 2 +-
src/org/python/antlr/ast/NameDerived.java | 2 +-
src/org/python/antlr/ast/NumDerived.java | 2 +-
src/org/python/antlr/ast/PassDerived.java | 2 +-
src/org/python/antlr/ast/PrintDerived.java | 2 +-
src/org/python/antlr/ast/RaiseDerived.java | 2 +-
src/org/python/antlr/ast/ReprDerived.java | 2 +-
src/org/python/antlr/ast/ReturnDerived.java | 2 +-
src/org/python/antlr/ast/SliceDerived.java | 2 +-
src/org/python/antlr/ast/StrDerived.java | 2 +-
src/org/python/antlr/ast/SubscriptDerived.java | 2 +-
src/org/python/antlr/ast/SuiteDerived.java | 2 +-
src/org/python/antlr/ast/TryExceptDerived.java | 2 +-
src/org/python/antlr/ast/TryFinallyDerived.java | 2 +-
src/org/python/antlr/ast/TupleDerived.java | 2 +-
src/org/python/antlr/ast/UnaryOpDerived.java | 2 +-
src/org/python/antlr/ast/WhileDerived.java | 2 +-
src/org/python/antlr/ast/WithDerived.java | 2 +-
src/org/python/antlr/ast/YieldDerived.java | 2 +-
src/org/python/antlr/ast/aliasDerived.java | 2 +-
src/org/python/antlr/ast/argumentsDerived.java | 2 +-
src/org/python/antlr/ast/comprehensionDerived.java | 2 +-
src/org/python/antlr/ast/keywordDerived.java | 2 +-
src/org/python/antlr/op/AddDerived.java | 2 +-
src/org/python/antlr/op/AndDerived.java | 2 +-
src/org/python/antlr/op/AugLoadDerived.java | 2 +-
src/org/python/antlr/op/AugStoreDerived.java | 2 +-
src/org/python/antlr/op/BitAndDerived.java | 2 +-
src/org/python/antlr/op/BitOrDerived.java | 2 +-
src/org/python/antlr/op/BitXorDerived.java | 2 +-
src/org/python/antlr/op/DelDerived.java | 2 +-
src/org/python/antlr/op/DivDerived.java | 2 +-
src/org/python/antlr/op/EqDerived.java | 2 +-
src/org/python/antlr/op/FloorDivDerived.java | 2 +-
src/org/python/antlr/op/GtDerived.java | 2 +-
src/org/python/antlr/op/GtEDerived.java | 2 +-
src/org/python/antlr/op/InDerived.java | 2 +-
src/org/python/antlr/op/InvertDerived.java | 2 +-
src/org/python/antlr/op/IsDerived.java | 2 +-
src/org/python/antlr/op/IsNotDerived.java | 2 +-
src/org/python/antlr/op/LShiftDerived.java | 2 +-
src/org/python/antlr/op/LoadDerived.java | 2 +-
src/org/python/antlr/op/LtDerived.java | 2 +-
src/org/python/antlr/op/LtEDerived.java | 2 +-
src/org/python/antlr/op/ModDerived.java | 2 +-
src/org/python/antlr/op/MultDerived.java | 2 +-
src/org/python/antlr/op/NotDerived.java | 2 +-
src/org/python/antlr/op/NotEqDerived.java | 2 +-
src/org/python/antlr/op/NotInDerived.java | 2 +-
src/org/python/antlr/op/OrDerived.java | 2 +-
src/org/python/antlr/op/ParamDerived.java | 2 +-
src/org/python/antlr/op/PowDerived.java | 2 +-
src/org/python/antlr/op/RShiftDerived.java | 2 +-
src/org/python/antlr/op/StoreDerived.java | 2 +-
src/org/python/antlr/op/SubDerived.java | 2 +-
src/org/python/antlr/op/UAddDerived.java | 2 +-
src/org/python/antlr/op/USubDerived.java | 2 +-
src/org/python/core/ClasspathPyImporterDerived.java | 2 +-
src/org/python/core/PyArrayDerived.java | 2 +-
src/org/python/core/PyBaseExceptionDerived.java | 2 +-
src/org/python/core/PyByteArrayDerived.java | 2 +-
src/org/python/core/PyClassMethodDerived.java | 2 +-
src/org/python/core/PyComplexDerived.java | 2 +-
src/org/python/core/PyDictionaryDerived.java | 2 +-
src/org/python/core/PyEnumerateDerived.java | 2 +-
src/org/python/core/PyFileDerived.java | 2 +-
src/org/python/core/PyFloatDerived.java | 2 +-
src/org/python/core/PyFrozenSetDerived.java | 2 +-
src/org/python/core/PyInstance.java | 2 +-
src/org/python/core/PyIntegerDerived.java | 2 +-
src/org/python/core/PyListDerived.java | 2 +-
src/org/python/core/PyLongDerived.java | 2 +-
src/org/python/core/PyModuleDerived.java | 2 +-
src/org/python/core/PyObjectDerived.java | 2 +-
src/org/python/core/PyPropertyDerived.java | 2 +-
src/org/python/core/PySetDerived.java | 2 +-
src/org/python/core/PyStringDerived.java | 2 +-
src/org/python/core/PySuperDerived.java | 2 +-
src/org/python/core/PyTupleDerived.java | 2 +-
src/org/python/core/PyTypeDerived.java | 2 +-
src/org/python/core/PyUnicodeDerived.java | 2 +-
src/org/python/core/finalization/FinalizablePyObject.java | 19 ++++++++++
src/org/python/modules/PyStructDerived.java | 2 +-
src/org/python/modules/_collections/PyDefaultDictDerived.java | 2 +-
src/org/python/modules/_collections/PyDequeDerived.java | 2 +-
src/org/python/modules/_csv/PyDialectDerived.java | 2 +-
src/org/python/modules/_functools/PyPartialDerived.java | 2 +-
src/org/python/modules/_io/PyFileIODerived.java | 2 +-
src/org/python/modules/_io/PyIOBaseDerived.java | 2 +-
src/org/python/modules/_io/PyRawIOBaseDerived.java | 2 +-
src/org/python/modules/_weakref/ReferenceTypeDerived.java | 2 +-
src/org/python/modules/bz2/PyBZ2CompressorDerived.java | 2 +-
src/org/python/modules/bz2/PyBZ2DecompressorDerived.java | 2 +-
src/org/python/modules/bz2/PyBZ2FileDerived.java | 2 +-
src/org/python/modules/itertools/PyTeeIteratorDerived.java | 2 +-
src/org/python/modules/itertools/chainDerived.java | 2 +-
src/org/python/modules/itertools/combinationsDerived.java | 2 +-
src/org/python/modules/itertools/combinationsWithReplacementDerived.java | 2 +-
src/org/python/modules/itertools/compressDerived.java | 2 +-
src/org/python/modules/itertools/countDerived.java | 2 +-
src/org/python/modules/itertools/cycleDerived.java | 2 +-
src/org/python/modules/itertools/dropwhileDerived.java | 2 +-
src/org/python/modules/itertools/groupbyDerived.java | 2 +-
src/org/python/modules/itertools/ifilterDerived.java | 2 +-
src/org/python/modules/itertools/ifilterfalseDerived.java | 2 +-
src/org/python/modules/itertools/isliceDerived.java | 2 +-
src/org/python/modules/itertools/izipDerived.java | 2 +-
src/org/python/modules/itertools/izipLongestDerived.java | 2 +-
src/org/python/modules/itertools/permutationsDerived.java | 2 +-
src/org/python/modules/itertools/productDerived.java | 2 +-
src/org/python/modules/itertools/repeatDerived.java | 2 +-
src/org/python/modules/itertools/starmapDerived.java | 2 +-
src/org/python/modules/itertools/takewhileDerived.java | 2 +-
src/org/python/modules/random/PyRandomDerived.java | 2 +-
src/org/python/modules/thread/PyLocalDerived.java | 2 +-
src/org/python/modules/zipimport/zipimporterDerived.java | 2 +-
src/templates/gderived-defs | 2 +-
149 files changed, 167 insertions(+), 148 deletions(-)
diff --git a/src/org/python/antlr/ast/AssertDerived.java b/src/org/python/antlr/ast/AssertDerived.java
--- a/src/org/python/antlr/ast/AssertDerived.java
+++ b/src/org/python/antlr/ast/AssertDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/AssignDerived.java b/src/org/python/antlr/ast/AssignDerived.java
--- a/src/org/python/antlr/ast/AssignDerived.java
+++ b/src/org/python/antlr/ast/AssignDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/AttributeDerived.java b/src/org/python/antlr/ast/AttributeDerived.java
--- a/src/org/python/antlr/ast/AttributeDerived.java
+++ b/src/org/python/antlr/ast/AttributeDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/AugAssignDerived.java b/src/org/python/antlr/ast/AugAssignDerived.java
--- a/src/org/python/antlr/ast/AugAssignDerived.java
+++ b/src/org/python/antlr/ast/AugAssignDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/BinOpDerived.java b/src/org/python/antlr/ast/BinOpDerived.java
--- a/src/org/python/antlr/ast/BinOpDerived.java
+++ b/src/org/python/antlr/ast/BinOpDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/BoolOpDerived.java b/src/org/python/antlr/ast/BoolOpDerived.java
--- a/src/org/python/antlr/ast/BoolOpDerived.java
+++ b/src/org/python/antlr/ast/BoolOpDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/BreakDerived.java b/src/org/python/antlr/ast/BreakDerived.java
--- a/src/org/python/antlr/ast/BreakDerived.java
+++ b/src/org/python/antlr/ast/BreakDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/CallDerived.java b/src/org/python/antlr/ast/CallDerived.java
--- a/src/org/python/antlr/ast/CallDerived.java
+++ b/src/org/python/antlr/ast/CallDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/ClassDefDerived.java b/src/org/python/antlr/ast/ClassDefDerived.java
--- a/src/org/python/antlr/ast/ClassDefDerived.java
+++ b/src/org/python/antlr/ast/ClassDefDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/CompareDerived.java b/src/org/python/antlr/ast/CompareDerived.java
--- a/src/org/python/antlr/ast/CompareDerived.java
+++ b/src/org/python/antlr/ast/CompareDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/ContinueDerived.java b/src/org/python/antlr/ast/ContinueDerived.java
--- a/src/org/python/antlr/ast/ContinueDerived.java
+++ b/src/org/python/antlr/ast/ContinueDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/DeleteDerived.java b/src/org/python/antlr/ast/DeleteDerived.java
--- a/src/org/python/antlr/ast/DeleteDerived.java
+++ b/src/org/python/antlr/ast/DeleteDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/DictDerived.java b/src/org/python/antlr/ast/DictDerived.java
--- a/src/org/python/antlr/ast/DictDerived.java
+++ b/src/org/python/antlr/ast/DictDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/EllipsisDerived.java b/src/org/python/antlr/ast/EllipsisDerived.java
--- a/src/org/python/antlr/ast/EllipsisDerived.java
+++ b/src/org/python/antlr/ast/EllipsisDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/ExceptHandlerDerived.java b/src/org/python/antlr/ast/ExceptHandlerDerived.java
--- a/src/org/python/antlr/ast/ExceptHandlerDerived.java
+++ b/src/org/python/antlr/ast/ExceptHandlerDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/ExecDerived.java b/src/org/python/antlr/ast/ExecDerived.java
--- a/src/org/python/antlr/ast/ExecDerived.java
+++ b/src/org/python/antlr/ast/ExecDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/ExprDerived.java b/src/org/python/antlr/ast/ExprDerived.java
--- a/src/org/python/antlr/ast/ExprDerived.java
+++ b/src/org/python/antlr/ast/ExprDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/ExpressionDerived.java b/src/org/python/antlr/ast/ExpressionDerived.java
--- a/src/org/python/antlr/ast/ExpressionDerived.java
+++ b/src/org/python/antlr/ast/ExpressionDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/ExtSliceDerived.java b/src/org/python/antlr/ast/ExtSliceDerived.java
--- a/src/org/python/antlr/ast/ExtSliceDerived.java
+++ b/src/org/python/antlr/ast/ExtSliceDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/ForDerived.java b/src/org/python/antlr/ast/ForDerived.java
--- a/src/org/python/antlr/ast/ForDerived.java
+++ b/src/org/python/antlr/ast/ForDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/FunctionDefDerived.java b/src/org/python/antlr/ast/FunctionDefDerived.java
--- a/src/org/python/antlr/ast/FunctionDefDerived.java
+++ b/src/org/python/antlr/ast/FunctionDefDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/GeneratorExpDerived.java b/src/org/python/antlr/ast/GeneratorExpDerived.java
--- a/src/org/python/antlr/ast/GeneratorExpDerived.java
+++ b/src/org/python/antlr/ast/GeneratorExpDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/GlobalDerived.java b/src/org/python/antlr/ast/GlobalDerived.java
--- a/src/org/python/antlr/ast/GlobalDerived.java
+++ b/src/org/python/antlr/ast/GlobalDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/IfDerived.java b/src/org/python/antlr/ast/IfDerived.java
--- a/src/org/python/antlr/ast/IfDerived.java
+++ b/src/org/python/antlr/ast/IfDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/IfExpDerived.java b/src/org/python/antlr/ast/IfExpDerived.java
--- a/src/org/python/antlr/ast/IfExpDerived.java
+++ b/src/org/python/antlr/ast/IfExpDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/ImportDerived.java b/src/org/python/antlr/ast/ImportDerived.java
--- a/src/org/python/antlr/ast/ImportDerived.java
+++ b/src/org/python/antlr/ast/ImportDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/ImportFromDerived.java b/src/org/python/antlr/ast/ImportFromDerived.java
--- a/src/org/python/antlr/ast/ImportFromDerived.java
+++ b/src/org/python/antlr/ast/ImportFromDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/IndexDerived.java b/src/org/python/antlr/ast/IndexDerived.java
--- a/src/org/python/antlr/ast/IndexDerived.java
+++ b/src/org/python/antlr/ast/IndexDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/InteractiveDerived.java b/src/org/python/antlr/ast/InteractiveDerived.java
--- a/src/org/python/antlr/ast/InteractiveDerived.java
+++ b/src/org/python/antlr/ast/InteractiveDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/LambdaDerived.java b/src/org/python/antlr/ast/LambdaDerived.java
--- a/src/org/python/antlr/ast/LambdaDerived.java
+++ b/src/org/python/antlr/ast/LambdaDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/ListCompDerived.java b/src/org/python/antlr/ast/ListCompDerived.java
--- a/src/org/python/antlr/ast/ListCompDerived.java
+++ b/src/org/python/antlr/ast/ListCompDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/ListDerived.java b/src/org/python/antlr/ast/ListDerived.java
--- a/src/org/python/antlr/ast/ListDerived.java
+++ b/src/org/python/antlr/ast/ListDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/ModuleDerived.java b/src/org/python/antlr/ast/ModuleDerived.java
--- a/src/org/python/antlr/ast/ModuleDerived.java
+++ b/src/org/python/antlr/ast/ModuleDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/NameDerived.java b/src/org/python/antlr/ast/NameDerived.java
--- a/src/org/python/antlr/ast/NameDerived.java
+++ b/src/org/python/antlr/ast/NameDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/NumDerived.java b/src/org/python/antlr/ast/NumDerived.java
--- a/src/org/python/antlr/ast/NumDerived.java
+++ b/src/org/python/antlr/ast/NumDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/PassDerived.java b/src/org/python/antlr/ast/PassDerived.java
--- a/src/org/python/antlr/ast/PassDerived.java
+++ b/src/org/python/antlr/ast/PassDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/PrintDerived.java b/src/org/python/antlr/ast/PrintDerived.java
--- a/src/org/python/antlr/ast/PrintDerived.java
+++ b/src/org/python/antlr/ast/PrintDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/RaiseDerived.java b/src/org/python/antlr/ast/RaiseDerived.java
--- a/src/org/python/antlr/ast/RaiseDerived.java
+++ b/src/org/python/antlr/ast/RaiseDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/ReprDerived.java b/src/org/python/antlr/ast/ReprDerived.java
--- a/src/org/python/antlr/ast/ReprDerived.java
+++ b/src/org/python/antlr/ast/ReprDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/ReturnDerived.java b/src/org/python/antlr/ast/ReturnDerived.java
--- a/src/org/python/antlr/ast/ReturnDerived.java
+++ b/src/org/python/antlr/ast/ReturnDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/SliceDerived.java b/src/org/python/antlr/ast/SliceDerived.java
--- a/src/org/python/antlr/ast/SliceDerived.java
+++ b/src/org/python/antlr/ast/SliceDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/StrDerived.java b/src/org/python/antlr/ast/StrDerived.java
--- a/src/org/python/antlr/ast/StrDerived.java
+++ b/src/org/python/antlr/ast/StrDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/SubscriptDerived.java b/src/org/python/antlr/ast/SubscriptDerived.java
--- a/src/org/python/antlr/ast/SubscriptDerived.java
+++ b/src/org/python/antlr/ast/SubscriptDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/SuiteDerived.java b/src/org/python/antlr/ast/SuiteDerived.java
--- a/src/org/python/antlr/ast/SuiteDerived.java
+++ b/src/org/python/antlr/ast/SuiteDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/TryExceptDerived.java b/src/org/python/antlr/ast/TryExceptDerived.java
--- a/src/org/python/antlr/ast/TryExceptDerived.java
+++ b/src/org/python/antlr/ast/TryExceptDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/TryFinallyDerived.java b/src/org/python/antlr/ast/TryFinallyDerived.java
--- a/src/org/python/antlr/ast/TryFinallyDerived.java
+++ b/src/org/python/antlr/ast/TryFinallyDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/TupleDerived.java b/src/org/python/antlr/ast/TupleDerived.java
--- a/src/org/python/antlr/ast/TupleDerived.java
+++ b/src/org/python/antlr/ast/TupleDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/UnaryOpDerived.java b/src/org/python/antlr/ast/UnaryOpDerived.java
--- a/src/org/python/antlr/ast/UnaryOpDerived.java
+++ b/src/org/python/antlr/ast/UnaryOpDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/WhileDerived.java b/src/org/python/antlr/ast/WhileDerived.java
--- a/src/org/python/antlr/ast/WhileDerived.java
+++ b/src/org/python/antlr/ast/WhileDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/WithDerived.java b/src/org/python/antlr/ast/WithDerived.java
--- a/src/org/python/antlr/ast/WithDerived.java
+++ b/src/org/python/antlr/ast/WithDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/YieldDerived.java b/src/org/python/antlr/ast/YieldDerived.java
--- a/src/org/python/antlr/ast/YieldDerived.java
+++ b/src/org/python/antlr/ast/YieldDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/aliasDerived.java b/src/org/python/antlr/ast/aliasDerived.java
--- a/src/org/python/antlr/ast/aliasDerived.java
+++ b/src/org/python/antlr/ast/aliasDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/argumentsDerived.java b/src/org/python/antlr/ast/argumentsDerived.java
--- a/src/org/python/antlr/ast/argumentsDerived.java
+++ b/src/org/python/antlr/ast/argumentsDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/comprehensionDerived.java b/src/org/python/antlr/ast/comprehensionDerived.java
--- a/src/org/python/antlr/ast/comprehensionDerived.java
+++ b/src/org/python/antlr/ast/comprehensionDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/ast/keywordDerived.java b/src/org/python/antlr/ast/keywordDerived.java
--- a/src/org/python/antlr/ast/keywordDerived.java
+++ b/src/org/python/antlr/ast/keywordDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/AddDerived.java b/src/org/python/antlr/op/AddDerived.java
--- a/src/org/python/antlr/op/AddDerived.java
+++ b/src/org/python/antlr/op/AddDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/AndDerived.java b/src/org/python/antlr/op/AndDerived.java
--- a/src/org/python/antlr/op/AndDerived.java
+++ b/src/org/python/antlr/op/AndDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/AugLoadDerived.java b/src/org/python/antlr/op/AugLoadDerived.java
--- a/src/org/python/antlr/op/AugLoadDerived.java
+++ b/src/org/python/antlr/op/AugLoadDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/AugStoreDerived.java b/src/org/python/antlr/op/AugStoreDerived.java
--- a/src/org/python/antlr/op/AugStoreDerived.java
+++ b/src/org/python/antlr/op/AugStoreDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/BitAndDerived.java b/src/org/python/antlr/op/BitAndDerived.java
--- a/src/org/python/antlr/op/BitAndDerived.java
+++ b/src/org/python/antlr/op/BitAndDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/BitOrDerived.java b/src/org/python/antlr/op/BitOrDerived.java
--- a/src/org/python/antlr/op/BitOrDerived.java
+++ b/src/org/python/antlr/op/BitOrDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/BitXorDerived.java b/src/org/python/antlr/op/BitXorDerived.java
--- a/src/org/python/antlr/op/BitXorDerived.java
+++ b/src/org/python/antlr/op/BitXorDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/DelDerived.java b/src/org/python/antlr/op/DelDerived.java
--- a/src/org/python/antlr/op/DelDerived.java
+++ b/src/org/python/antlr/op/DelDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/DivDerived.java b/src/org/python/antlr/op/DivDerived.java
--- a/src/org/python/antlr/op/DivDerived.java
+++ b/src/org/python/antlr/op/DivDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/EqDerived.java b/src/org/python/antlr/op/EqDerived.java
--- a/src/org/python/antlr/op/EqDerived.java
+++ b/src/org/python/antlr/op/EqDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/FloorDivDerived.java b/src/org/python/antlr/op/FloorDivDerived.java
--- a/src/org/python/antlr/op/FloorDivDerived.java
+++ b/src/org/python/antlr/op/FloorDivDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/GtDerived.java b/src/org/python/antlr/op/GtDerived.java
--- a/src/org/python/antlr/op/GtDerived.java
+++ b/src/org/python/antlr/op/GtDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/GtEDerived.java b/src/org/python/antlr/op/GtEDerived.java
--- a/src/org/python/antlr/op/GtEDerived.java
+++ b/src/org/python/antlr/op/GtEDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/InDerived.java b/src/org/python/antlr/op/InDerived.java
--- a/src/org/python/antlr/op/InDerived.java
+++ b/src/org/python/antlr/op/InDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/InvertDerived.java b/src/org/python/antlr/op/InvertDerived.java
--- a/src/org/python/antlr/op/InvertDerived.java
+++ b/src/org/python/antlr/op/InvertDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/IsDerived.java b/src/org/python/antlr/op/IsDerived.java
--- a/src/org/python/antlr/op/IsDerived.java
+++ b/src/org/python/antlr/op/IsDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/IsNotDerived.java b/src/org/python/antlr/op/IsNotDerived.java
--- a/src/org/python/antlr/op/IsNotDerived.java
+++ b/src/org/python/antlr/op/IsNotDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/LShiftDerived.java b/src/org/python/antlr/op/LShiftDerived.java
--- a/src/org/python/antlr/op/LShiftDerived.java
+++ b/src/org/python/antlr/op/LShiftDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/LoadDerived.java b/src/org/python/antlr/op/LoadDerived.java
--- a/src/org/python/antlr/op/LoadDerived.java
+++ b/src/org/python/antlr/op/LoadDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/LtDerived.java b/src/org/python/antlr/op/LtDerived.java
--- a/src/org/python/antlr/op/LtDerived.java
+++ b/src/org/python/antlr/op/LtDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/LtEDerived.java b/src/org/python/antlr/op/LtEDerived.java
--- a/src/org/python/antlr/op/LtEDerived.java
+++ b/src/org/python/antlr/op/LtEDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/ModDerived.java b/src/org/python/antlr/op/ModDerived.java
--- a/src/org/python/antlr/op/ModDerived.java
+++ b/src/org/python/antlr/op/ModDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/MultDerived.java b/src/org/python/antlr/op/MultDerived.java
--- a/src/org/python/antlr/op/MultDerived.java
+++ b/src/org/python/antlr/op/MultDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/NotDerived.java b/src/org/python/antlr/op/NotDerived.java
--- a/src/org/python/antlr/op/NotDerived.java
+++ b/src/org/python/antlr/op/NotDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/NotEqDerived.java b/src/org/python/antlr/op/NotEqDerived.java
--- a/src/org/python/antlr/op/NotEqDerived.java
+++ b/src/org/python/antlr/op/NotEqDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/NotInDerived.java b/src/org/python/antlr/op/NotInDerived.java
--- a/src/org/python/antlr/op/NotInDerived.java
+++ b/src/org/python/antlr/op/NotInDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/OrDerived.java b/src/org/python/antlr/op/OrDerived.java
--- a/src/org/python/antlr/op/OrDerived.java
+++ b/src/org/python/antlr/op/OrDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/ParamDerived.java b/src/org/python/antlr/op/ParamDerived.java
--- a/src/org/python/antlr/op/ParamDerived.java
+++ b/src/org/python/antlr/op/ParamDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/PowDerived.java b/src/org/python/antlr/op/PowDerived.java
--- a/src/org/python/antlr/op/PowDerived.java
+++ b/src/org/python/antlr/op/PowDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/RShiftDerived.java b/src/org/python/antlr/op/RShiftDerived.java
--- a/src/org/python/antlr/op/RShiftDerived.java
+++ b/src/org/python/antlr/op/RShiftDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/StoreDerived.java b/src/org/python/antlr/op/StoreDerived.java
--- a/src/org/python/antlr/op/StoreDerived.java
+++ b/src/org/python/antlr/op/StoreDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/SubDerived.java b/src/org/python/antlr/op/SubDerived.java
--- a/src/org/python/antlr/op/SubDerived.java
+++ b/src/org/python/antlr/op/SubDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/UAddDerived.java b/src/org/python/antlr/op/UAddDerived.java
--- a/src/org/python/antlr/op/UAddDerived.java
+++ b/src/org/python/antlr/op/UAddDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/antlr/op/USubDerived.java b/src/org/python/antlr/op/USubDerived.java
--- a/src/org/python/antlr/op/USubDerived.java
+++ b/src/org/python/antlr/op/USubDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/ClasspathPyImporterDerived.java b/src/org/python/core/ClasspathPyImporterDerived.java
--- a/src/org/python/core/ClasspathPyImporterDerived.java
+++ b/src/org/python/core/ClasspathPyImporterDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
public ClasspathPyImporterDerived(PyType subtype) {
diff --git a/src/org/python/core/PyArrayDerived.java b/src/org/python/core/PyArrayDerived.java
--- a/src/org/python/core/PyArrayDerived.java
+++ b/src/org/python/core/PyArrayDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PyBaseExceptionDerived.java b/src/org/python/core/PyBaseExceptionDerived.java
--- a/src/org/python/core/PyBaseExceptionDerived.java
+++ b/src/org/python/core/PyBaseExceptionDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
public PyBaseExceptionDerived(PyType subtype) {
diff --git a/src/org/python/core/PyByteArrayDerived.java b/src/org/python/core/PyByteArrayDerived.java
--- a/src/org/python/core/PyByteArrayDerived.java
+++ b/src/org/python/core/PyByteArrayDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PyClassMethodDerived.java b/src/org/python/core/PyClassMethodDerived.java
--- a/src/org/python/core/PyClassMethodDerived.java
+++ b/src/org/python/core/PyClassMethodDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PyComplexDerived.java b/src/org/python/core/PyComplexDerived.java
--- a/src/org/python/core/PyComplexDerived.java
+++ b/src/org/python/core/PyComplexDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PyDictionaryDerived.java b/src/org/python/core/PyDictionaryDerived.java
--- a/src/org/python/core/PyDictionaryDerived.java
+++ b/src/org/python/core/PyDictionaryDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PyEnumerateDerived.java b/src/org/python/core/PyEnumerateDerived.java
--- a/src/org/python/core/PyEnumerateDerived.java
+++ b/src/org/python/core/PyEnumerateDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PyFileDerived.java b/src/org/python/core/PyFileDerived.java
--- a/src/org/python/core/PyFileDerived.java
+++ b/src/org/python/core/PyFileDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PyFloatDerived.java b/src/org/python/core/PyFloatDerived.java
--- a/src/org/python/core/PyFloatDerived.java
+++ b/src/org/python/core/PyFloatDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PyFrozenSetDerived.java b/src/org/python/core/PyFrozenSetDerived.java
--- a/src/org/python/core/PyFrozenSetDerived.java
+++ b/src/org/python/core/PyFrozenSetDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PyInstance.java b/src/org/python/core/PyInstance.java
--- a/src/org/python/core/PyInstance.java
+++ b/src/org/python/core/PyInstance.java
@@ -154,7 +154,7 @@
}
public static void ensureFinalizer(PyObject[] args, String[] kws) {
- FinalizeTrigger.ensureFinalizer((PyInstance) args[0]);
+ ((PyInstance) args[0]).finalizeTrigger = FinalizeTrigger.makeTrigger((PyInstance) args[0]);
}
private static JavaFunc makeFunction__ensure_finalizer__() {
diff --git a/src/org/python/core/PyIntegerDerived.java b/src/org/python/core/PyIntegerDerived.java
--- a/src/org/python/core/PyIntegerDerived.java
+++ b/src/org/python/core/PyIntegerDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PyListDerived.java b/src/org/python/core/PyListDerived.java
--- a/src/org/python/core/PyListDerived.java
+++ b/src/org/python/core/PyListDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PyLongDerived.java b/src/org/python/core/PyLongDerived.java
--- a/src/org/python/core/PyLongDerived.java
+++ b/src/org/python/core/PyLongDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PyModuleDerived.java b/src/org/python/core/PyModuleDerived.java
--- a/src/org/python/core/PyModuleDerived.java
+++ b/src/org/python/core/PyModuleDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
public PyModuleDerived(PyType subtype) {
diff --git a/src/org/python/core/PyObjectDerived.java b/src/org/python/core/PyObjectDerived.java
--- a/src/org/python/core/PyObjectDerived.java
+++ b/src/org/python/core/PyObjectDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PyPropertyDerived.java b/src/org/python/core/PyPropertyDerived.java
--- a/src/org/python/core/PyPropertyDerived.java
+++ b/src/org/python/core/PyPropertyDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PySetDerived.java b/src/org/python/core/PySetDerived.java
--- a/src/org/python/core/PySetDerived.java
+++ b/src/org/python/core/PySetDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PyStringDerived.java b/src/org/python/core/PyStringDerived.java
--- a/src/org/python/core/PyStringDerived.java
+++ b/src/org/python/core/PyStringDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PySuperDerived.java b/src/org/python/core/PySuperDerived.java
--- a/src/org/python/core/PySuperDerived.java
+++ b/src/org/python/core/PySuperDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PyTupleDerived.java b/src/org/python/core/PyTupleDerived.java
--- a/src/org/python/core/PyTupleDerived.java
+++ b/src/org/python/core/PyTupleDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/PyTypeDerived.java b/src/org/python/core/PyTypeDerived.java
--- a/src/org/python/core/PyTypeDerived.java
+++ b/src/org/python/core/PyTypeDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
public PyTypeDerived(PyType subtype) {
diff --git a/src/org/python/core/PyUnicodeDerived.java b/src/org/python/core/PyUnicodeDerived.java
--- a/src/org/python/core/PyUnicodeDerived.java
+++ b/src/org/python/core/PyUnicodeDerived.java
@@ -28,7 +28,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/core/finalization/FinalizablePyObject.java b/src/org/python/core/finalization/FinalizablePyObject.java
--- a/src/org/python/core/finalization/FinalizablePyObject.java
+++ b/src/org/python/core/finalization/FinalizablePyObject.java
@@ -62,6 +62,10 @@
* In the block where the resurrection occurs, let your {@code __del__}- or
* {@code __del_builtin__}-method call<br>
* {@code FinalizeTrigger.ensureFinalizer(this);}.
+ * If you implement {@code __del__} in Python and need this functionality, you can
+ * simply call {@code someObject.__ensure_finalizer__()}<br>
+ * Note that this is Jython specific and should be surrounded by a {@code try/except}
+ * block to ensure compatibility with other Python implementations.
* </li>
* </ol>
* </p>
@@ -73,6 +77,21 @@
* achieve this manually via step 5).
* </p>
* <p>
+ * The built-in function {@code __ensure_finalizer__} is also useful if a class acquires a
+ * finalizer after instances have already been created. Usually only those instances that were
+ * created after their class acquired the finalizer will actually be finalized (in contrast to
+ * CPython).
+ * However, one can manually tell earlier created instances to become finalizable by
+ * calling {@code __ensure_finalizer__()} on them. As mentioned above, it is recommended to
+ * surround this with a {@code try/except} block to ensure compatibility with other Python
+ * implementations.
+ * </p>
+ * <p>
+ * Note that it is not possible to overwrite {@code __ensure_finalizer__} on Python side.
+ * If one overwrites {@code __ensure_finalizer__} on Python side, Jython will ignore the
+ * overwrite-implementation and still call the original one.
+ * </p>
+ * <p>
* It is possible to switch finalization on and off at any desired time for a certain object.
* This can be helpful if it is only necessary to have {@code __del__} or
* {@code __del_builtin__} called for certain configurations of an object.
diff --git a/src/org/python/modules/PyStructDerived.java b/src/org/python/modules/PyStructDerived.java
--- a/src/org/python/modules/PyStructDerived.java
+++ b/src/org/python/modules/PyStructDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/_collections/PyDefaultDictDerived.java b/src/org/python/modules/_collections/PyDefaultDictDerived.java
--- a/src/org/python/modules/_collections/PyDefaultDictDerived.java
+++ b/src/org/python/modules/_collections/PyDefaultDictDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/_collections/PyDequeDerived.java b/src/org/python/modules/_collections/PyDequeDerived.java
--- a/src/org/python/modules/_collections/PyDequeDerived.java
+++ b/src/org/python/modules/_collections/PyDequeDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/_csv/PyDialectDerived.java b/src/org/python/modules/_csv/PyDialectDerived.java
--- a/src/org/python/modules/_csv/PyDialectDerived.java
+++ b/src/org/python/modules/_csv/PyDialectDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
public PyDialectDerived(PyType subtype) {
diff --git a/src/org/python/modules/_functools/PyPartialDerived.java b/src/org/python/modules/_functools/PyPartialDerived.java
--- a/src/org/python/modules/_functools/PyPartialDerived.java
+++ b/src/org/python/modules/_functools/PyPartialDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/_io/PyFileIODerived.java b/src/org/python/modules/_io/PyFileIODerived.java
--- a/src/org/python/modules/_io/PyFileIODerived.java
+++ b/src/org/python/modules/_io/PyFileIODerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
public PyFileIODerived(PyType subtype,PyObject file,OpenMode mode,boolean closefd) {
diff --git a/src/org/python/modules/_io/PyIOBaseDerived.java b/src/org/python/modules/_io/PyIOBaseDerived.java
--- a/src/org/python/modules/_io/PyIOBaseDerived.java
+++ b/src/org/python/modules/_io/PyIOBaseDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
public PyIOBaseDerived(PyType subtype) {
diff --git a/src/org/python/modules/_io/PyRawIOBaseDerived.java b/src/org/python/modules/_io/PyRawIOBaseDerived.java
--- a/src/org/python/modules/_io/PyRawIOBaseDerived.java
+++ b/src/org/python/modules/_io/PyRawIOBaseDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
public PyRawIOBaseDerived(PyType subtype) {
diff --git a/src/org/python/modules/_weakref/ReferenceTypeDerived.java b/src/org/python/modules/_weakref/ReferenceTypeDerived.java
--- a/src/org/python/modules/_weakref/ReferenceTypeDerived.java
+++ b/src/org/python/modules/_weakref/ReferenceTypeDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/bz2/PyBZ2CompressorDerived.java b/src/org/python/modules/bz2/PyBZ2CompressorDerived.java
--- a/src/org/python/modules/bz2/PyBZ2CompressorDerived.java
+++ b/src/org/python/modules/bz2/PyBZ2CompressorDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/bz2/PyBZ2DecompressorDerived.java b/src/org/python/modules/bz2/PyBZ2DecompressorDerived.java
--- a/src/org/python/modules/bz2/PyBZ2DecompressorDerived.java
+++ b/src/org/python/modules/bz2/PyBZ2DecompressorDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/bz2/PyBZ2FileDerived.java b/src/org/python/modules/bz2/PyBZ2FileDerived.java
--- a/src/org/python/modules/bz2/PyBZ2FileDerived.java
+++ b/src/org/python/modules/bz2/PyBZ2FileDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/PyTeeIteratorDerived.java b/src/org/python/modules/itertools/PyTeeIteratorDerived.java
--- a/src/org/python/modules/itertools/PyTeeIteratorDerived.java
+++ b/src/org/python/modules/itertools/PyTeeIteratorDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/chainDerived.java b/src/org/python/modules/itertools/chainDerived.java
--- a/src/org/python/modules/itertools/chainDerived.java
+++ b/src/org/python/modules/itertools/chainDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/combinationsDerived.java b/src/org/python/modules/itertools/combinationsDerived.java
--- a/src/org/python/modules/itertools/combinationsDerived.java
+++ b/src/org/python/modules/itertools/combinationsDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/combinationsWithReplacementDerived.java b/src/org/python/modules/itertools/combinationsWithReplacementDerived.java
--- a/src/org/python/modules/itertools/combinationsWithReplacementDerived.java
+++ b/src/org/python/modules/itertools/combinationsWithReplacementDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/compressDerived.java b/src/org/python/modules/itertools/compressDerived.java
--- a/src/org/python/modules/itertools/compressDerived.java
+++ b/src/org/python/modules/itertools/compressDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/countDerived.java b/src/org/python/modules/itertools/countDerived.java
--- a/src/org/python/modules/itertools/countDerived.java
+++ b/src/org/python/modules/itertools/countDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/cycleDerived.java b/src/org/python/modules/itertools/cycleDerived.java
--- a/src/org/python/modules/itertools/cycleDerived.java
+++ b/src/org/python/modules/itertools/cycleDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/dropwhileDerived.java b/src/org/python/modules/itertools/dropwhileDerived.java
--- a/src/org/python/modules/itertools/dropwhileDerived.java
+++ b/src/org/python/modules/itertools/dropwhileDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/groupbyDerived.java b/src/org/python/modules/itertools/groupbyDerived.java
--- a/src/org/python/modules/itertools/groupbyDerived.java
+++ b/src/org/python/modules/itertools/groupbyDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/ifilterDerived.java b/src/org/python/modules/itertools/ifilterDerived.java
--- a/src/org/python/modules/itertools/ifilterDerived.java
+++ b/src/org/python/modules/itertools/ifilterDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/ifilterfalseDerived.java b/src/org/python/modules/itertools/ifilterfalseDerived.java
--- a/src/org/python/modules/itertools/ifilterfalseDerived.java
+++ b/src/org/python/modules/itertools/ifilterfalseDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/isliceDerived.java b/src/org/python/modules/itertools/isliceDerived.java
--- a/src/org/python/modules/itertools/isliceDerived.java
+++ b/src/org/python/modules/itertools/isliceDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/izipDerived.java b/src/org/python/modules/itertools/izipDerived.java
--- a/src/org/python/modules/itertools/izipDerived.java
+++ b/src/org/python/modules/itertools/izipDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/izipLongestDerived.java b/src/org/python/modules/itertools/izipLongestDerived.java
--- a/src/org/python/modules/itertools/izipLongestDerived.java
+++ b/src/org/python/modules/itertools/izipLongestDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/permutationsDerived.java b/src/org/python/modules/itertools/permutationsDerived.java
--- a/src/org/python/modules/itertools/permutationsDerived.java
+++ b/src/org/python/modules/itertools/permutationsDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/productDerived.java b/src/org/python/modules/itertools/productDerived.java
--- a/src/org/python/modules/itertools/productDerived.java
+++ b/src/org/python/modules/itertools/productDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/repeatDerived.java b/src/org/python/modules/itertools/repeatDerived.java
--- a/src/org/python/modules/itertools/repeatDerived.java
+++ b/src/org/python/modules/itertools/repeatDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/starmapDerived.java b/src/org/python/modules/itertools/starmapDerived.java
--- a/src/org/python/modules/itertools/starmapDerived.java
+++ b/src/org/python/modules/itertools/starmapDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/itertools/takewhileDerived.java b/src/org/python/modules/itertools/takewhileDerived.java
--- a/src/org/python/modules/itertools/takewhileDerived.java
+++ b/src/org/python/modules/itertools/takewhileDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/random/PyRandomDerived.java b/src/org/python/modules/random/PyRandomDerived.java
--- a/src/org/python/modules/random/PyRandomDerived.java
+++ b/src/org/python/modules/random/PyRandomDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/org/python/modules/thread/PyLocalDerived.java b/src/org/python/modules/thread/PyLocalDerived.java
--- a/src/org/python/modules/thread/PyLocalDerived.java
+++ b/src/org/python/modules/thread/PyLocalDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
public PyLocalDerived(PyType subtype) {
diff --git a/src/org/python/modules/zipimport/zipimporterDerived.java b/src/org/python/modules/zipimport/zipimporterDerived.java
--- a/src/org/python/modules/zipimport/zipimporterDerived.java
+++ b/src/org/python/modules/zipimport/zipimporterDerived.java
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger=FinalizeTrigger.makeTrigger(this);
}
private PyObject dict;
diff --git a/src/templates/gderived-defs b/src/templates/gderived-defs
--- a/src/templates/gderived-defs
+++ b/src/templates/gderived-defs
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger = FinalizeTrigger.makeTrigger(this);
}
`decls;
--
Repository URL: http://hg.python.org/jython
More information about the Jython-checkins
mailing list