merge 0.6 series to trunk.

1 files changed, 3 insertions, 3 deletions

diff --git a/test/ext/test_associationproxy.py b/test/ext/test_associationproxy.py
index 8df449718..4a5775218 100644
--- a/test/ext/test_associationproxy.py
+++ b/test/ext/test_associationproxy.py
@@ -1,6 +1,5 @@
 from sqlalchemy.test.testing import eq_, assert_raises
 import copy
-import gc
 import pickle
 
 from sqlalchemy import *
@@ -8,6 +7,7 @@ from sqlalchemy.orm import *
 from sqlalchemy.orm.collections import collection
 from sqlalchemy.ext.associationproxy import *
 from sqlalchemy.test import *
+from sqlalchemy.test.util import gc_collect
 
 
 class DictCollection(dict):
@@ -880,7 +880,7 @@ class ReconstitutionTest(TestBase):
 
 
         add_child('p1', 'c1')
-        gc.collect()
+        gc_collect()
         add_child('p1', 'c2')
 
         session.flush()
@@ -895,7 +895,7 @@ class ReconstitutionTest(TestBase):
         p.kids.extend(['c1', 'c2'])
         p_copy = copy.copy(p)
         del p
-        gc.collect()
+        gc_collect()
 
         assert set(p_copy.kids) == set(['c1', 'c2']), p.kids