summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-06-19 22:03:50 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-06-19 22:03:50 (GMT)
commit620626b1605b750790b66c701c754bf32cdb56dc (patch)
tree21b7d79cd13cb9d37654115a1e2d6a311d015e7c /Lib/test
parent9196dc66ae57a7cb751a42d49e5ab6038c916ff7 (diff)
downloadcpython-620626b1605b750790b66c701c754bf32cdb56dc.zip
cpython-620626b1605b750790b66c701c754bf32cdb56dc.tar.gz
cpython-620626b1605b750790b66c701c754bf32cdb56dc.tar.bz2
merge error: test.test_support is now test.support
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_multiprocessing.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 95c5c73..5522c07 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -1759,7 +1759,7 @@ def test_main(run=None):
try:
lock = multiprocessing.RLock()
except OSError:
- from test.test_support import TestSkipped
+ from test.support import TestSkipped
raise TestSkipped("OSError raises on RLock creation, see issue 3111!")
if run is None: