From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Thu, 19 Jun 2008 22:03:50 +0000 (+0000)
Subject: merge error: test.test_support is now test.support
X-Git-Tag: v3.0b2~181
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=620626b1605b750790b66c701c754bf32cdb56dc;p=thirdparty%2FPython%2Fcpython.git

merge error: test.test_support is now test.support
---

diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 95c5c73989ce..5522c073ca11 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: