#22092: use absolute imports in unittest tests. Patch by Vajrasky Kok.

diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
index b69fdb3e0849691e978b504ffcad377631a38ece..4ddf4362e0a02ced617c7d28d4a534d94d39785c 100644 (file)
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -9,7 +9,7 @@ from test import test_support
 
 import unittest
 
-from .support import (
+from unittest.test.support import (
     TestEquality, TestHashing, LoggingResult, ResultWithNoStartTestRunStopTestRun
 )
 

diff --git a/Lib/unittest/test/test_discovery.py b/Lib/unittest/test/test_discovery.py
index e0277d5787e847493fcb0de757a9282a68744919..8577f0519204530f77e405b243f3a2ac4f8e06b8 100644 (file)
--- a/Lib/unittest/test/test_discovery.py
+++ b/Lib/unittest/test/test_discovery.py
@@ -3,6 +3,7 @@ import re
 import sys
 
 import unittest
+import unittest.test
 
 
 class TestDiscovery(unittest.TestCase):

diff --git a/Lib/unittest/test/test_functiontestcase.py b/Lib/unittest/test/test_functiontestcase.py
index 63dd87815094fc509168dd3902f2495963f479e9..3a7889c29743c6d922b675d801dac81068117d4e 100644 (file)
--- a/Lib/unittest/test/test_functiontestcase.py
+++ b/Lib/unittest/test/test_functiontestcase.py
@@ -1,6 +1,6 @@
 import unittest
 
-from .support import LoggingResult
+from unittest.test.support import LoggingResult
 
 
 class Test_FunctionTestCase(unittest.TestCase):

diff --git a/Lib/unittest/test/test_program.py b/Lib/unittest/test/test_program.py
index 45d90975e7d784e78d1305aaccbfa034eeff031e..8eca83d62035e5254888081c60c332f03481c0d4 100644 (file)
--- a/Lib/unittest/test/test_program.py
+++ b/Lib/unittest/test/test_program.py
@@ -3,6 +3,7 @@ from cStringIO import StringIO
 import os
 import sys
 import unittest
+import unittest.test
 
 
 class Test_TestProgram(unittest.TestCase):

diff --git a/Lib/unittest/test/test_runner.py b/Lib/unittest/test/test_runner.py
index 3b661d3340814fac8da5b69d54523e61af5c765b..d6d5261429c07f4c9c43a340c561a62a79c309eb 100644 (file)
--- a/Lib/unittest/test/test_runner.py
+++ b/Lib/unittest/test/test_runner.py
@@ -3,7 +3,8 @@ import unittest
 from cStringIO import StringIO
 import pickle
 
-from .support import LoggingResult, ResultWithNoStartTestRunStopTestRun
+from unittest.test.support import (LoggingResult,
+                                   ResultWithNoStartTestRunStopTestRun)
 
 
 class TestCleanUp(unittest.TestCase):

diff --git a/Lib/unittest/test/test_skipping.py b/Lib/unittest/test/test_skipping.py
index d6639d17e55ad79fa8af6b145263f389ad422cf2..6312231491d8aa4f28dd637f43057d8416766bbb 100644 (file)
--- a/Lib/unittest/test/test_skipping.py
+++ b/Lib/unittest/test/test_skipping.py
@@ -1,6 +1,6 @@
 import unittest
 
-from .support import LoggingResult
+from unittest.test.support import LoggingResult
 
 
 class Test_TestSkipping(unittest.TestCase):

diff --git a/Lib/unittest/test/test_suite.py b/Lib/unittest/test/test_suite.py
index 72fb527a68537f5846927674105db4d696dd8e05..65b5b1452e5447fda7b2b11c100d55e72c2305b4 100644 (file)
--- a/Lib/unittest/test/test_suite.py
+++ b/Lib/unittest/test/test_suite.py
@@ -1,7 +1,7 @@
 import unittest
 
 import sys
-from .support import LoggingResult, TestEquality
+from unittest.test.support import LoggingResult, TestEquality
 
 
 ### Support code for Test_TestSuite