[Python-checkins] r79969 - in python/branches/py3k: Lib/test/support.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Sun Apr 11 23:22:10 2010
New Revision: 79969

Log:
Merged revisions 79934 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79934 | philip.jenvey | 2010-04-10 14:39:07 -0500 (Sat, 10 Apr 2010) | 1 line
  
  adjust gc_collect for Jython
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/support.py

Modified: python/branches/py3k/Lib/test/support.py
==============================================================================
--- python/branches/py3k/Lib/test/support.py	(original)
+++ python/branches/py3k/Lib/test/support.py	Sun Apr 11 23:22:10 2010
@@ -17,6 +17,7 @@
 import importlib
 import collections
 import re
+import time
 
 __all__ = ["Error", "TestFailed", "ResourceDenied", "import_module",
            "verbose", "use_resources", "max_memuse", "record_original_stdout",
@@ -750,6 +751,8 @@
     objects to disappear.
     """
     gc.collect()
+    if is_jython:
+        time.sleep(0.1)
     gc.collect()
     gc.collect()
 
@@ -1064,7 +1067,6 @@
 
 def threading_cleanup(nb_threads):
     import _thread
-    import time
 
     _MAX_COUNT = 10
     for count in range(_MAX_COUNT):