[Python-checkins] cpython (2.7): #22092: use absolute imports in unittest tests. Patch by Vajrasky Kok.

ezio.melotti python-checkins at python.org
Thu Aug 7 02:29:57 CEST 2014


http://hg.python.org/cpython/rev/6e5a2ac30c7e
changeset:   92030:6e5a2ac30c7e
branch:      2.7
parent:      92024:217485e80a32
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Aug 07 03:20:22 2014 +0300
summary:
  #22092: use absolute imports in unittest tests.  Patch by Vajrasky Kok.

files:
  Lib/unittest/test/test_case.py             |  2 +-
  Lib/unittest/test/test_discovery.py        |  1 +
  Lib/unittest/test/test_functiontestcase.py |  2 +-
  Lib/unittest/test/test_program.py          |  1 +
  Lib/unittest/test/test_runner.py           |  3 ++-
  Lib/unittest/test/test_skipping.py         |  2 +-
  Lib/unittest/test/test_suite.py            |  2 +-
  7 files changed, 8 insertions(+), 5 deletions(-)


diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -9,7 +9,7 @@
 
 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
--- a/Lib/unittest/test/test_discovery.py
+++ b/Lib/unittest/test/test_discovery.py
@@ -3,6 +3,7 @@
 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
--- 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
--- a/Lib/unittest/test/test_program.py
+++ b/Lib/unittest/test/test_program.py
@@ -3,6 +3,7 @@
 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
--- a/Lib/unittest/test/test_runner.py
+++ b/Lib/unittest/test/test_runner.py
@@ -3,7 +3,8 @@
 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
--- 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
--- 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

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list