summaryrefslogtreecommitdiffstats
path: root/Lib/test/support.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-06-01 23:14:51 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-06-01 23:14:51 (GMT)
commit8cc7d88bbcae32e5b7e12b0c4cfe34de2cff8166 (patch)
treea344b56e92dc8a1b6a0e6d58c98788c883e28165 /Lib/test/support.py
parentbe5f3712be7aeb7fee4698a24bcf44ffd98a7b1d (diff)
downloadcpython-8cc7d88bbcae32e5b7e12b0c4cfe34de2cff8166.zip
cpython-8cc7d88bbcae32e5b7e12b0c4cfe34de2cff8166.tar.gz
cpython-8cc7d88bbcae32e5b7e12b0c4cfe34de2cff8166.tar.bz2
Merged revisions 73073-73074,73089 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r73073 | benjamin.peterson | 2009-05-31 09:43:00 -0500 (Sun, 31 May 2009) | 1 line remove function import ........ r73074 | benjamin.peterson | 2009-05-31 10:00:27 -0500 (Sun, 31 May 2009) | 1 line __enter__ and __exit__ must be on the class ........ r73089 | andrew.kuchling | 2009-05-31 19:14:19 -0500 (Sun, 31 May 2009) | 1 line The class for regexes isn't called RegexObject any more; correct the text ........
Diffstat (limited to 'Lib/test/support.py')
-rw-r--r--Lib/test/support.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py
index b91d732..bdc6b89 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -6,6 +6,7 @@ if __name__ != 'test.support':
import contextlib
import errno
import functools
+import gc
import socket
import sys
import os
@@ -630,7 +631,6 @@ def gc_collect():
longer than expected. This function tries its best to force all garbage
objects to disappear.
"""
- import gc
gc.collect()
gc.collect()
gc.collect()