diff -r c2d3feeb61ed Lib/unittest/test/test_case.py --- a/Lib/unittest/test/test_case.py Sun Jul 27 16:11:30 2014 +0200 +++ b/Lib/unittest/test/test_case.py Sun Jul 27 21:59:37 2014 +0700 @@ -14,7 +14,7 @@ import unittest -from .support import ( +from unittest.test.support import ( TestEquality, TestHashing, LoggingResult, LegacyLoggingResult, ResultWithNoStartTestRunStopTestRun ) diff -r c2d3feeb61ed Lib/unittest/test/test_discovery.py --- a/Lib/unittest/test/test_discovery.py Sun Jul 27 16:11:30 2014 +0200 +++ b/Lib/unittest/test/test_discovery.py Sun Jul 27 21:59:37 2014 +0700 @@ -6,6 +6,7 @@ from test import support import unittest +from unittest import test class TestableTestProgram(unittest.TestProgram): @@ -435,7 +436,7 @@ loader = unittest.TestLoader() tests = [self] - expectedPath = os.path.abspath(os.path.dirname(unittest.test.__file__)) + expectedPath = os.path.abspath(os.path.dirname(test.__file__)) self.wasRun = False def _find_tests(start_dir, pattern, namespace=None): diff -r c2d3feeb61ed Lib/unittest/test/test_functiontestcase.py --- a/Lib/unittest/test/test_functiontestcase.py Sun Jul 27 16:11:30 2014 +0200 +++ b/Lib/unittest/test/test_functiontestcase.py Sun Jul 27 21:59:37 2014 +0700 @@ -1,6 +1,6 @@ import unittest -from .support import LoggingResult +from unittest.test.support import LoggingResult class Test_FunctionTestCase(unittest.TestCase): diff -r c2d3feeb61ed Lib/unittest/test/test_program.py --- a/Lib/unittest/test/test_program.py Sun Jul 27 16:11:30 2014 +0200 +++ b/Lib/unittest/test/test_program.py Sun Jul 27 21:59:37 2014 +0700 @@ -4,6 +4,7 @@ import sys from test import support import unittest +from unittest import test class Test_TestProgram(unittest.TestCase): @@ -12,7 +13,7 @@ loader = unittest.TestLoader() tests = [self] - expectedPath = os.path.abspath(os.path.dirname(unittest.test.__file__)) + expectedPath = os.path.abspath(os.path.dirname(test.__file__)) self.wasRun = False def _find_tests(start_dir, pattern): diff -r c2d3feeb61ed Lib/unittest/test/test_runner.py --- a/Lib/unittest/test/test_runner.py Sun Jul 27 16:11:30 2014 +0200 +++ b/Lib/unittest/test/test_runner.py Sun Jul 27 21:59:37 2014 +0700 @@ -7,7 +7,8 @@ import unittest from unittest.case import _Outcome -from .support import LoggingResult, ResultWithNoStartTestRunStopTestRun +from unittest.test.support import (LoggingResult, + ResultWithNoStartTestRunStopTestRun) class TestCleanUp(unittest.TestCase): diff -r c2d3feeb61ed Lib/unittest/test/test_skipping.py --- a/Lib/unittest/test/test_skipping.py Sun Jul 27 16:11:30 2014 +0200 +++ b/Lib/unittest/test/test_skipping.py Sun Jul 27 21:59:37 2014 +0700 @@ -1,6 +1,6 @@ import unittest -from .support import LoggingResult +from unittest.test.support import LoggingResult class Test_TestSkipping(unittest.TestCase): diff -r c2d3feeb61ed Lib/unittest/test/test_suite.py --- a/Lib/unittest/test/test_suite.py Sun Jul 27 16:11:30 2014 +0200 +++ b/Lib/unittest/test/test_suite.py Sun Jul 27 21:59:37 2014 +0700 @@ -3,7 +3,7 @@ import gc import sys import weakref -from .support import LoggingResult, TestEquality +from unittest.test.support import LoggingResult, TestEquality ### Support code for Test_TestSuite