#22092: merge with 3.4.

Lib/unittest/test/test_case.py

@@ -14,7 +14,7 @@ from test import support
 
 import unittest
 
-from .support import (
+from unittest.test.support import (
     TestEquality, TestHashing, LoggingResult, LegacyLoggingResult,
     ResultWithNoStartTestRunStopTestRun
 )

Lib/unittest/test/test_discovery.py

@@ -6,6 +6,7 @@ import builtins
 from test import support
 
 import unittest
+import unittest.test
 
 
 class TestableTestProgram(unittest.TestProgram):

Lib/unittest/test/test_functiontestcase.py

 import unittest
 
-from .support import LoggingResult
+from unittest.test.support import LoggingResult
 
 
 class Test_FunctionTestCase(unittest.TestCase):

Lib/unittest/test/test_program.py

@@ -4,6 +4,7 @@ import os
 import sys
 from test import support
 import unittest
+import unittest.test
 
 
 class Test_TestProgram(unittest.TestCase):

Lib/unittest/test/test_runner.py

@@ -7,7 +7,8 @@ import subprocess
 import unittest
 from unittest.case import _Outcome
 
-from .support import LoggingResult, ResultWithNoStartTestRunStopTestRun
+from unittest.test.support import (LoggingResult,
+                                   ResultWithNoStartTestRunStopTestRun)
 
 
 class TestCleanUp(unittest.TestCase):

Lib/unittest/test/test_skipping.py

 import unittest
 
-from .support import LoggingResult
+from unittest.test.support import LoggingResult
 
 
 class Test_TestSkipping(unittest.TestCase):

Lib/unittest/test/test_suite.py

@@ -3,7 +3,7 @@ import unittest
 import gc
 import sys
 import weakref
-from .support import LoggingResult, TestEquality
+from unittest.test.support import LoggingResult, TestEquality
 
 
 ### Support code for Test_TestSuite