jython-checkins Mailing List for Jython (Page 86)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5146
          http://jython.svn.sourceforge.net/jython/?rev=5146&view=rev
Author:   zyasoft
Date:     2008-08-11 05:52:43 +0000 (Mon, 11 Aug 2008)

Log Message:
-----------
Another corner case for generators: .throw on a just-started generator
should immediately raise an exception in the current context. Also
fixed buggy tests in test_generators.

Modified Paths:
--------------
    branches/asm/Lib/test/test_generators.py
    branches/asm/Lib/test/test_genexps.py
    branches/asm/src/org/python/core/PyGenerator.java

Modified: branches/asm/Lib/test/test_generators.py
===================================================================

--- branches/asm/Lib/test/test_generators.py	2008-08-11 05:37:15 UTC (rev 5145)
+++ branches/asm/Lib/test/test_generators.py	2008-08-11 05:52:43 UTC (rev 5146)
@@ -728,14 +728,14 @@
 
 syntax_tests = """
 
->>> def f():
+>>> def f(): #doctest: +IGNORE_EXCEPTION_DETAIL, +NORMALIZE_WHITESPACE
 ...     return 22
 ...     yield 1
 Traceback (most recent call last):
   ..
 SyntaxError: 'return' with argument inside generator (<doctest test.test_generators.__test__.syntax[0]>, line 3)
 
->>> def f():
+>>> def f(): #doctest: +IGNORE_EXCEPTION_DETAIL, +NORMALIZE_WHITESPACE
 ...     yield 1
 ...     return 22
 Traceback (most recent call last):
@@ -744,7 +744,7 @@
 
 "return None" is not the same as "return" in a generator:
 
->>> def f():
+>>> def f(): #doctest: +IGNORE_EXCEPTION_DETAIL, +NORMALIZE_WHITESPACE
 ...     yield 1
 ...     return None
 Traceback (most recent call last):
@@ -1522,17 +1522,17 @@
 
 Check some syntax errors for yield expressions:
 
->>> f=lambda: (yield 1),(yield 2)
+>>> f=lambda: (yield 1),(yield 2) #doctest: +IGNORE_EXCEPTION_DETAIL, +NORMALIZE_WHITESPACE
 Traceback (most recent call last):
   ...
 SyntaxError: 'yield' outside function (<doctest test.test_generators.__test__.coroutine[21]>, line 1)
 
->>> def f(): return lambda x=(yield): 1
+>>> def f(): return lambda x=(yield): 1 #doctest: +IGNORE_EXCEPTION_DETAIL, +NORMALIZE_WHITESPACE
 Traceback (most recent call last):
   ...
 SyntaxError: 'return' with argument inside generator (<doctest test.test_generators.__test__.coroutine[22]>, line 1)
 
->>> def f(): x = yield = y
+>>> def f(): x = yield = y #doctest: +IGNORE_EXCEPTION_DETAIL, +NORMALIZE_WHITESPACE
 Traceback (most recent call last):
   ...
 SyntaxError: assignment to yield expression not possible (<doctest test.test_generators.__test__.coroutine[23]>, line 1)
@@ -1580,7 +1580,7 @@
   ...
 TypeError: instance exception may not have a separate value
 
->>> g.throw(ValueError, "foo", 23)      # bad args
+>>> g.throw(ValueError, "foo", 23)      # bad args #doctest: +IGNORE_EXCEPTION_DETAIL
 Traceback (most recent call last):
   ...
 TypeError: throw() third argument must be a traceback object
@@ -1645,8 +1645,9 @@
 >>> g.next()
 >>> g.close()           # close normally
 
-And finalization:
-
+And finalization. But we have to force the timing of GC here, since we are running on Jython:
+>>> import gc
+>>> from time import sleep
 >>> def f():
 ...     try: yield
 ...     finally:
@@ -1654,7 +1655,7 @@
 
 >>> g = f()
 >>> g.next()
->>> del g
+>>> del g; gc.collect(); sleep(1); gc.collect()
 exiting
 
 
@@ -1679,9 +1680,9 @@
 >>> old, sys.stderr = sys.stderr, StringIO.StringIO()
 >>> g = f()
 >>> g.next()
->>> del g
+>>> del g; gc.collect(); sleep(1); gc.collect()
 >>> sys.stderr.getvalue().startswith(
-...     "Exception exceptions.RuntimeError: 'generator ignored GeneratorExit' in "
+...     "Exception RuntimeError"
 ... )
 True
 >>> sys.stderr = old
@@ -1787,6 +1788,8 @@
 to test.
 
 >>> import sys, StringIO
+>>> from time import sleep
+>>> import gc
 >>> old = sys.stderr
 >>> try:
 ...     sys.stderr = StringIO.StringIO()
@@ -1795,10 +1798,10 @@
 ...             raise RuntimeError
 ...
 ...     l = Leaker()
-...     del l
+...     del l; gc.collect(); sleep(1); gc.collect()
 ...     err = sys.stderr.getvalue().strip()
 ...     err.startswith(
-...         "Exception exceptions.RuntimeError: RuntimeError() in <"
+...         "Exception RuntimeError in <"
 ...     )
 ...     err.endswith("> ignored")
 ...     len(err.splitlines())

Modified: branches/asm/Lib/test/test_genexps.py
===================================================================
--- branches/asm/Lib/test/test_genexps.py	2008-08-11 05:37:15 UTC (rev 5145)
+++ branches/asm/Lib/test/test_genexps.py	2008-08-11 05:52:43 UTC (rev 5146)
@@ -133,13 +133,13 @@
     >>> list(g)
     [(0, 0), (0, 1), (0, 2), (0, 3), (1, 0), (1, 1), (1, 2), (1, 3), (2, 0), (2, 1), (2, 2), (2, 3)]
 
-This doesn't make sense for Jython or other non refcounted implementations
-# Verify re-use of tuples (a side benefit of using genexps over listcomps)
-#
-#     >>> tupleids = map(id, ((i,i) for i in xrange(10)))
-#     >>> int(max(tupleids) - min(tupleids))
-#     0
+This doesn't make sense for Jython or other non refcounted implementations, so +SKIP
+Verify re-use of tuples (a side benefit of using genexps over listcomps)
 
+    >>> tupleids = map(id, ((i,i) for i in xrange(10)))
+    >>> int(max(tupleids) - min(tupleids)) #doctest: +SKIP
+    0
+
 Verify that syntax error's are raised for genexps used as lvalues
 
     >>> (y for y in (1,2)) = 10 #doctest: +IGNORE_EXCEPTION_DETAIL

Modified: branches/asm/src/org/python/core/PyGenerator.java
===================================================================
--- branches/asm/src/org/python/core/PyGenerator.java	2008-08-11 05:37:15 UTC (rev 5145)
+++ branches/asm/src/org/python/core/PyGenerator.java	2008-08-11 05:52:43 UTC (rev 5146)
@@ -46,8 +46,9 @@
     }
 
     private PyObject raiseException(PyException ex) {
-        if (gi_frame == null)
-            return null;
+        if (gi_frame == null || gi_frame.f_lasti == 0) {
+            throw ex;
+        }
         gi_frame.setGeneratorInput(ex);
         return next();
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov (107)	Dec (67)
2001	Jan (76)	Feb (125)	Mar (72)	Apr (13)	May (18)	Jun (12)	Jul (129)	Aug (47)	Sep (1)	Oct (36)	Nov (128)	Dec (124)
2002	Jan (59)	Feb	Mar (14)	Apr (14)	May (72)	Jun (9)	Jul (3)	Aug (5)	Sep (18)	Oct (65)	Nov (28)	Dec (12)
2003	Jan (10)	Feb (2)	Mar (4)	Apr (33)	May (21)	Jun (9)	Jul (29)	Aug (34)	Sep (4)	Oct (8)	Nov (15)	Dec (4)
2004	Jan (26)	Feb (12)	Mar (11)	Apr (9)	May (7)	Jun	Jul (5)	Aug	Sep (3)	Oct (7)	Nov (1)	Dec (10)
2005	Jan (2)	Feb (72)	Mar (16)	Apr (39)	May (48)	Jun (97)	Jul (57)	Aug (13)	Sep (16)	Oct (24)	Nov (100)	Dec (24)
2006	Jan (15)	Feb (34)	Mar (33)	Apr (31)	May (79)	Jun (64)	Jul (41)	Aug (64)	Sep (31)	Oct (46)	Nov (55)	Dec (37)
2007	Jan (32)	Feb (61)	Mar (11)	Apr (58)	May (46)	Jun (30)	Jul (94)	Aug (93)	Sep (86)	Oct (69)	Nov (125)	Dec (177)
2008	Jan (169)	Feb (97)	Mar (74)	Apr (113)	May (120)	Jun (334)	Jul (215)	Aug (237)	Sep (72)	Oct (189)	Nov (126)	Dec (160)
2009	Jan (180)	Feb (45)	Mar (98)	Apr (140)	May (151)	Jun (71)	Jul (107)	Aug (119)	Sep (73)	Oct (121)	Nov (14)	Dec (6)
2010	Jan (13)	Feb (9)	Mar (10)	Apr (64)	May (3)	Jun (16)	Jul (7)	Aug (23)	Sep (17)	Oct (37)	Nov (5)	Dec (8)
2011	Jan (10)	Feb (11)	Mar (77)	Apr (11)	May (2)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

jython-checkins Mailing List for Jython (Page 86)

jython-checkins — For Jython checkin messages