o make StopIteration (and the like) a 'sink state' in iter and call-iter, to

pjenvey · pjenvey · commit cc005ab79cf0 · 2008-07-08T05:24:17.000Z
fix the test_iter test_sinkstate_* tests
o workaround test_iter test_unpack_iter GC related issues
diff --git a/Lib/test/test_iter.py b/Lib/test/test_iter.py
@@ -780,18 +780,24 @@ def test_unpack_iter(self):
 
         # Test reference count behavior
 
-        class C(object):
+        # XXX: Jython new style objects don't support __del__ yet
+        from test_weakref import extra_collect
+        #class C(object):
+        class C:
             count = 0
-            def __new__(cls):
+            #def __new__(cls):
+            def __init__(self):
+                cls = C
                 cls.count += 1
-                return object.__new__(cls)
+                #return object.__new__(cls)
             def __del__(self):
                 cls = self.__class__
                 assert cls.count > 0
                 cls.count -= 1
         x = C()
         self.assertEqual(C.count, 1)
         del x
+        extra_collect()
         self.assertEqual(C.count, 0)
         l = [C(), C(), C()]
         self.assertEqual(C.count, 3)
@@ -800,6 +806,7 @@ def __del__(self):
         except ValueError:
             pass
         del l
+        extra_collect()
         self.assertEqual(C.count, 0)
 
 
diff --git a/src/org/python/core/PyCallIter.java b/src/org/python/core/PyCallIter.java
@@ -15,19 +15,25 @@ public PyCallIter(PyObject callable, PyObject sentinel) {
     }
 
     public PyObject __iternext__() {
-        PyObject val = null;
+        if (callable == null) {
+            return null;
+        }
+
+        PyObject result;
         try {
-            val = callable.__call__();
+            result = callable.__call__();
         } catch (PyException exc) {
             if (Py.matchException(exc, Py.StopIteration)) {
+                callable = null;
                 stopException = exc;
                 return null;
             }
             throw exc;
         }
-        if (val._eq(sentinel).__nonzero__()) {
+        if (result._eq(sentinel).__nonzero__()) {
+            callable = null;
             return null;
         }
-        return val;
+        return result;
     }
 }
diff --git a/src/org/python/core/PySequenceIter.java b/src/org/python/core/PySequenceIter.java
@@ -10,14 +10,24 @@ public PySequenceIter(PyObject seq) {
     }
 
     public PyObject __iternext__() {
+        if (seq == null) {
+            return null;
+        }
+
+        PyObject result;
         try {
-            return seq.__finditem__(idx++);
+            result = seq.__finditem__(idx++);
         } catch (PyException exc) {
-            if (Py.matchException(exc, Py.StopIteration))
+            if (Py.matchException(exc, Py.StopIteration)) {
+                seq = null;
                 return null;
+            }
             throw exc;
         }
+        if (result == null) {
+            seq = null;
+        }
+        return result;
     }
-
 }
 

Original file line number	Diff line number	Diff line change
`@@ -15,19 +15,25 @@ public PyCallIter(PyObject callable, PyObject sentinel) {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public PyObject __iternext__() {`
`18`		`- PyObject val = null;`
	`18`	`+ if (callable == null) {`
	`19`	`+ return null;`
	`20`	`+ }`
	`21`	`+`
	`22`	`+ PyObject result;`
`19`	`23`	`try {`
`20`		`- val = callable.__call__();`
	`24`	`+ result = callable.__call__();`
`21`	`25`	`} catch (PyException exc) {`
`22`	`26`	`if (Py.matchException(exc, Py.StopIteration)) {`
	`27`	`+ callable = null;`
`23`	`28`	`stopException = exc;`
`24`	`29`	`return null;`
`25`	`30`	`}`
`26`	`31`	`throw exc;`
`27`	`32`	`}`
`28`		`- if (val._eq(sentinel).__nonzero__()) {`
	`33`	`+ if (result._eq(sentinel).__nonzero__()) {`
	`34`	`+ callable = null;`
`29`	`35`	`return null;`
`30`	`36`	`}`
`31`		`- return val;`
	`37`	`+ return result;`
`32`	`38`	`}`
`33`	`39`	`}`