]> granicus.if.org Git - python/commitdiff
merge error: test.test_support is now test.support
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>
Thu, 19 Jun 2008 22:03:50 +0000 (22:03 +0000)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>
Thu, 19 Jun 2008 22:03:50 +0000 (22:03 +0000)
Lib/test/test_multiprocessing.py

index 95c5c73989cef02fb0632934a679373308243a55..5522c073ca1173d7bf77e5082e0393050d8a2d39 100644 (file)
@@ -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: