merge 0.6 series to trunk.

1 files changed, 24 insertions, 0 deletions

diff --git a/lib/sqlalchemy/test/util.py b/lib/sqlalchemy/test/util.py
new file mode 100644
index 000000000..60b0a4ef8
--- /dev/null
+++ b/lib/sqlalchemy/test/util.py
@@ -0,0 +1,24 @@
+from sqlalchemy.util import jython, function_named
+
+import gc
+import time
+
+if jython:
+    def gc_collect(*args):
+        """aggressive gc.collect for tests."""
+        gc.collect()
+        time.sleep(0.1)
+        gc.collect()
+        gc.collect()
+        return 0
+        
+    # "lazy" gc, for VM's that don't GC on refcount == 0
+    lazy_gc = gc_collect
+
+else:
+    # assume CPython - straight gc.collect, lazy_gc() is a pass
+    gc_collect = gc.collect
+    def lazy_gc():
+        pass
+
+