[Jython-checkins] SF.net SVN: jython:[5117] branches/asm/Lib/test/test_deque.py

[<pj...@us...>]

Revision: 5117
          http://jython.svn.sourceforge.net/jython/?rev=5117&view=rev
Author:   pjenvey
Date:     2008-08-09 06:18:29 +0000 (Sat, 09 Aug 2008)

Log Message:
-----------
fix test_weakref, re-enable 2.5isms

Modified Paths:
--------------
    branches/asm/Lib/test/test_deque.py

Modified: branches/asm/Lib/test/test_deque.py
===================================================================
--- branches/asm/Lib/test/test_deque.py	2008-08-09 06:17:43 UTC (rev 5116)
+++ branches/asm/Lib/test/test_deque.py	2008-08-09 06:18:29 UTC (rev 5117)
@@ -475,6 +475,9 @@
         p = proxy(d)
         self.assertEqual(str(p), str(d))
         d = None
+        if test_support.is_jython:
+            from test_weakref import extra_collect()
+            extra_collect()
         self.assertRaises(ReferenceError, str, p)
 
     def test_strange_subclass(self):
@@ -563,7 +566,7 @@
 
 
 >>> def roundrobin(*iterables):
-...     pending = deque([iter(i) for i in iterables])
+...     pending = deque(iter(i) for i in iterables)
 ...     while pending:
 ...         task = pending.popleft()
 ...         try:
@@ -612,13 +615,6 @@
         TestSubclassWithKwargs,
     )
 
-    if test_support.is_jython:
-      # Jython doesn't weakref things immediately
-      del TestSubclass.test_weakref
-
-      # Needs 2.5 seq_tests
-      del TestVariousIteratorArgs.test_constructor
-
     test_support.run_unittest(*test_classes)
 
     # verify reference counting


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