summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2014-08-07 03:20:22 +0300
committerEzio Melotti <ezio.melotti@gmail.com>2014-08-07 03:20:22 +0300
commit8c2b71cc48c11cf67ddc5a59ecb515f74c2c2e4e (patch)
treea50e60f9178603ada5cb60702a0ed192c12e74be
parent555bec437f0c871a9e8618cda5f74bad65728b15 (diff)
downloadcpython-8c2b71cc48c11cf67ddc5a59ecb515f74c2c2e4e.tar.gz
#22092: use absolute imports in unittest tests. Patch by Vajrasky Kok.
-rw-r--r--Lib/unittest/test/test_case.py2
-rw-r--r--Lib/unittest/test/test_discovery.py1
-rw-r--r--Lib/unittest/test/test_functiontestcase.py2
-rw-r--r--Lib/unittest/test/test_program.py1
-rw-r--r--Lib/unittest/test/test_runner.py3
-rw-r--r--Lib/unittest/test/test_skipping.py2
-rw-r--r--Lib/unittest/test/test_suite.py2
7 files changed, 8 insertions, 5 deletions
diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
index 49325784d2..e70dd5bd03 100644
--- a/Lib/unittest/test/test_case.py
+++ b/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
)
diff --git a/Lib/unittest/test/test_discovery.py b/Lib/unittest/test/test_discovery.py
index 6b7b1280f8..abb90669b3 100644
--- a/Lib/unittest/test/test_discovery.py
+++ b/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):
diff --git a/Lib/unittest/test/test_functiontestcase.py b/Lib/unittest/test/test_functiontestcase.py
index d7fe07a53b..c5f2bcbe74 100644
--- 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 3294298030..725d67fdaf 100644
--- a/Lib/unittest/test/test_program.py
+++ b/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):
diff --git a/Lib/unittest/test/test_runner.py b/Lib/unittest/test/test_runner.py
index ef1c1af9f1..7c0bd51d79 100644
--- a/Lib/unittest/test/test_runner.py
+++ b/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):
diff --git a/Lib/unittest/test/test_skipping.py b/Lib/unittest/test/test_skipping.py
index 314a7a4d0f..807510f15f 100644
--- 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 38311ca488..0551a16996 100644
--- a/Lib/unittest/test/test_suite.py
+++ b/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