[Jython-checkins] jython (merge default -> default): Updated merge of newstyle finalization support
jim.baker
jython-checkins at python.org
Thu Sep 4 06:35:49 CEST 2014
http://hg.python.org/jython/rev/6953968b2638
changeset: 7367:6953968b2638
parent: 7363:61081b8859c1
parent: 7366:b3e0d7ee59fc
user: Jim Baker <jim.baker at rackspace.com>
date: Wed Sep 03 22:02:03 2014 -0600
summary:
Updated merge of newstyle finalization support
files:
Lib/test/test_finalizers.py | 76 +++++-----
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 | 5 +-
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 | 21 ++-
src/org/python/core/finalization/FinalizeTrigger.java | 5 +-
src/org/python/core/finalization/FinalizeTriggerFactory.java | 7 +-
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 | 12 +-
152 files changed, 221 insertions(+), 197 deletions(-)
diff --git a/Lib/test/test_finalizers.py b/Lib/test/test_finalizers.py
--- a/Lib/test/test_finalizers.py
+++ b/Lib/test/test_finalizers.py
@@ -198,14 +198,14 @@
A = DummyClassDel("A")
A = None
runGCIfJython()
- assert("A finalized (DummyClassDel)" in finalizeMsgList)
+ self.assertIn("A finalized (DummyClassDel)", finalizeMsgList)
def test_classAcquiresFinalizer_beforeInstanciation_oldStyleClass(self):
DummyClass.__del__ = delClass
B = DummyClass("B")
B = None
runGCIfJython()
- assert("B finalized (acquired by class)" in finalizeMsgList)
+ self.assertIn("B finalized (acquired by class)", finalizeMsgList)
del DummyClass.__del__
def test_classAcquiresFinalizer_afterInstanciation_oldStyleClass(self):
@@ -218,7 +218,7 @@
pass
C = None
runGCIfJython()
- assert("C finalized (acquired by class)" in finalizeMsgList)
+ self.assertIn("C finalized (acquired by class)", finalizeMsgList)
del DummyClass.__del__
def test_instanceAcquiresFinalizer_bound_oldStyleClass(self):
@@ -227,21 +227,21 @@
D.__del__ = dl
D = None
runGCIfJython()
- assert("D finalized (DummyClassDel)" not in finalizeMsgList)
- assert("D finalized (acquired by object)" in finalizeMsgList)
+ self.assertNotIn("D finalized (DummyClassDel)", finalizeMsgList)
+ self.assertIn("D finalized (acquired by object)", finalizeMsgList)
def test_finalizer_builtin_newStyleClass(self):
E = DummyClassDelNew("E")
E = None
runGCIfJython()
- assert("E finalized (DummyClassDelNew)" in finalizeMsgList)
+ self.assertIn("E finalized (DummyClassDelNew)", finalizeMsgList)
def test_classAcquiresFinalizer_beforeInstanciation_newStyleClass(self):
DummyClassNew.__del__ = delClass
F = DummyClassNew("F")
F = None
runGCIfJython()
- assert("F finalized (acquired by class)" in finalizeMsgList)
+ self.assertIn("F finalized (acquired by class)", finalizeMsgList)
del DummyClassNew.__del__
def test_classAcquiresFinalizer_afterInstanciation_newStyleClass(self):
@@ -254,7 +254,7 @@
pass
G = None
runGCIfJython()
- assert("G finalized (acquired by class)" in finalizeMsgList)
+ self.assertIn("G finalized (acquired by class)", finalizeMsgList)
del DummyClassNew.__del__
def test_instanceAcquiresFinalizer_bound_newStyleClass(self):
@@ -265,8 +265,8 @@
H.__del__ = types.MethodType(delObject, H.name)
H = None
runGCIfJython()
- assert("H finalized (DummyClassDelNew)" in finalizeMsgList)
- assert("H finalized (acquired by object)" not in finalizeMsgList)
+ self.assertIn("H finalized (DummyClassDelNew)", finalizeMsgList)
+ self.assertNotIn("H finalized (acquired by object)", finalizeMsgList)
def test_instanceAcquiresFinalizer_bound_newStyleClass2(self):
"""
@@ -279,16 +279,16 @@
H.__del__()
H = None
runGCIfJython()
- assert("H2 finalized (DummyClassDelNew)" in finalizeMsgList)
- assert("H2 finalized (acquired by object)" in finalizeMsgList)
+ self.assertIn("H2 finalized (DummyClassDelNew)", finalizeMsgList)
+ self.assertIn("H2 finalized (acquired by object)", finalizeMsgList)
def test_objectResurrection_oldStyleClass(self):
ResurrectableDummyClass.__del__ = delI
I = ResurrectableDummyClass("I")
I = None
runGCIfJython()
- assert("I finalized (ResurrectableDummyClass)" in finalizeMsgList)
- assert(str(resurrectedObject_I) == "I")
+ self.assertIn("I finalized (ResurrectableDummyClass)", finalizeMsgList)
+ self.assertEqual(str(resurrectedObject_I), "I")
def test_objectDoubleResurrection_oldStyleClass(self):
#okay to fail in Jython without the manual ensureFinalizer calls
@@ -297,12 +297,12 @@
J = None
runGCIfJython()
- assert("J finalized (ResurrectableDummyClass)" in finalizeMsgList)
+ self.assertIn("J finalized (ResurrectableDummyClass)", finalizeMsgList)
global resurrectedObject_J
- assert(str(resurrectedObject_J) == "J")
+ self.assertEqual(str(resurrectedObject_J), "J")
J = resurrectedObject_J
resurrectedObject_J = None
- assert(resurrectedObject_J is None)
+ self.assertIsNone(resurrectedObject_J)
try:
#For Jython one can restore the finalizer manually.
#This is offered as an easy fix if the CPython behavior
@@ -313,7 +313,7 @@
J = None
runGCIfJython()
- assert(str(resurrectedObject_J) == "J")
+ self.assertEqual(str(resurrectedObject_J), "J")
resurrectedObject_J.doResurrection = False
try:
#again...
@@ -323,7 +323,7 @@
resurrectedObject_J = None
runGCIfJython()
- assert(resurrectedObject_J is None)
+ self.assertIsNone(resurrectedObject_J)
def test_objectDoubleResurrectionAndFinalize_oldStyleClass(self):
@@ -333,14 +333,14 @@
K = None
runGCIfJython()
- assert("K finalized (ResurrectableDummyClass)" in finalizeMsgList)
+ self.assertIn("K finalized (ResurrectableDummyClass)", finalizeMsgList)
finalizeMsgList.remove("K finalized (ResurrectableDummyClass)")
- assert("K finalized (ResurrectableDummyClass)" not in finalizeMsgList)
+ self.assertNotIn("K finalized (ResurrectableDummyClass)", finalizeMsgList)
global resurrectedObject_K
- assert(str(resurrectedObject_K) == "K")
+ self.assertEqual(str(resurrectedObject_K), "K")
K = resurrectedObject_K
resurrectedObject_K = None
- assert(resurrectedObject_K is None)
+ self.assertIsNone(resurrectedObject_K)
try:
K.__ensure_finalizer__()
except:
@@ -348,16 +348,16 @@
K = None
runGCIfJython()
- assert("K finalized (ResurrectableDummyClass)" in finalizeMsgList)
- assert(str(resurrectedObject_K) == "K")
+ self.assertIn("K finalized (ResurrectableDummyClass)", finalizeMsgList)
+ self.assertEqual(str(resurrectedObject_K), "K")
def test_objectResurrection_newStyleClass(self):
ResurrectableDummyClassNew.__del__ = delL
L = ResurrectableDummyClassNew("L")
L = None
runGCIfJython()
- assert("L finalized (ResurrectableDummyClass)" in finalizeMsgList)
- assert(str(resurrectedObject_L) == "L")
+ self.assertIn("L finalized (ResurrectableDummyClass)", finalizeMsgList)
+ self.assertEqual(str(resurrectedObject_L), "L")
def test_objectDoubleResurrection_newStyleClass(self):
#okay to fail in Jython without the manual ensureFinalizer calls
@@ -366,12 +366,12 @@
M = None
runGCIfJython()
- assert("M finalized (ResurrectableDummyClass)" in finalizeMsgList)
+ self.assertIn("M finalized (ResurrectableDummyClass)", finalizeMsgList)
global resurrectedObject_M
- assert(str(resurrectedObject_M) == "M")
+ self.assertEqual(str(resurrectedObject_M), "M")
M = resurrectedObject_M
resurrectedObject_M = None
- assert(resurrectedObject_M is None)
+ self.assertIsNone(resurrectedObject_M, None)
try:
M.__ensure_finalizer__()
except:
@@ -379,7 +379,7 @@
M = None
runGCIfJython()
- assert(str(resurrectedObject_M) == "M")
+ self.assertEqual(str(resurrectedObject_M), "M")
def test_objectDoubleResurrectionAndFinalize_newStyleClass(self):
#okay to fail in Jython without the manual ensureFinalizer calls
@@ -388,14 +388,14 @@
N = None
runGCIfJython()
- assert("N finalized (ResurrectableDummyClass)" in finalizeMsgList)
+ self.assertIn("N finalized (ResurrectableDummyClass)", finalizeMsgList)
finalizeMsgList.remove("N finalized (ResurrectableDummyClass)")
- assert("N finalized (ResurrectableDummyClass)" not in finalizeMsgList)
+ self.assertNotIn("N finalized (ResurrectableDummyClass)", finalizeMsgList)
global resurrectedObject_N
- assert(str(resurrectedObject_N) == "N")
+ self.assertEqual(str(resurrectedObject_N), "N")
N = resurrectedObject_N
resurrectedObject_N = None
- assert(resurrectedObject_N is None)
+ self.assertIsNone(resurrectedObject_N)
try:
N.__ensure_finalizer__()
except:
@@ -403,15 +403,15 @@
N = None
runGCIfJython()
- assert("N finalized (ResurrectableDummyClass)" in finalizeMsgList)
- assert(str(resurrectedObject_N) == "N")
+ self.assertIn("N finalized (ResurrectableDummyClass)", finalizeMsgList)
+ self.assertEqual(str(resurrectedObject_N), "N")
def test_file_overwrite_del(self):
O = DummyFileClassNew("O")
O = None
runGCIfJython()
- assert("O finalized (DummyFileClassNew)" in finalizeMsgList)
+ self.assertIn("O finalized (DummyFileClassNew)", finalizeMsgList)
if __name__ == '__main__':
unittest.main()
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,9 +154,10 @@
}
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__() {
try {
return new JavaFunc(
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
@@ -58,10 +58,14 @@
* <li>
* (optional)<br>
* If your finalizer resurrects the object (Python allows this) and you wish the
- * finalizer to run again on next collection of the object:</br>
+ * finalizer to run again on next collection of the object:<br>
* 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/core/finalization/FinalizeTrigger.java b/src/org/python/core/finalization/FinalizeTrigger.java
--- a/src/org/python/core/finalization/FinalizeTrigger.java
+++ b/src/org/python/core/finalization/FinalizeTrigger.java
@@ -9,8 +9,9 @@
public class FinalizeTrigger {
/**
- * This optional factory hook allows to replace the
- * default {@code FinalizeTrigger}. It is f.i. needed by JyNI.
+ * This factory hook is reserved for use by JyNI.
+ * It allows to replace the default {@code FinalizeTrigger}.
+ * JyNI needs it to support garbage collection.
*/
public static FinalizeTriggerFactory factory;
diff --git a/src/org/python/core/finalization/FinalizeTriggerFactory.java b/src/org/python/core/finalization/FinalizeTriggerFactory.java
--- a/src/org/python/core/finalization/FinalizeTriggerFactory.java
+++ b/src/org/python/core/finalization/FinalizeTriggerFactory.java
@@ -1,6 +1,9 @@
package org.python.core.finalization;
+/**
+ * Reserved for use by JyNI.
+ */
public interface FinalizeTriggerFactory {
-
- public FinalizeTrigger makeTrigger(HasFinalizeTrigger toFinalize);
+
+ public FinalizeTrigger makeTrigger(HasFinalizeTrigger toFinalize);
}
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
@@ -17,11 +17,11 @@
public void setSlot(int index, PyObject value) {
slots[index] = value;
}
-
+
private PyObject[] slots;
-
+
public void __del_derived__() {
- PyType self_type = getType();
+ PyType self_type = getType();
PyObject impl = self_type.lookup("__del__");
if (impl != null) {
impl.__get__(this, self_type).__call__();
@@ -29,7 +29,7 @@
}
public void __ensure_finalizer__() {
- FinalizeTrigger.ensureFinalizer(this);
+ finalizeTrigger = FinalizeTrigger.makeTrigger(this);
}
`decls;
@@ -44,7 +44,7 @@
if (impl != null) {
PyObject res = impl.__get__(this,self_type).__call__(other);
if (res == Py.NotImplemented)
- return null;
+ return null;
return res;
}
return super.`binary(other);
@@ -56,7 +56,7 @@
if (impl != null) {
PyObject res = impl.__get__(this,self_type).__call__(other);
if (res == Py.NotImplemented)
- return null;
+ return null;
return res;
}
return super.`binary(other);
--
Repository URL: http://hg.python.org/jython
More information about the Jython-checkins
mailing list