summaryrefslogtreecommitdiffstats
path: root/Lib/unittest/test/test_runner.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2014-08-07 00:28:26 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2014-08-07 00:28:26 (GMT)
commit869778e520a6bdf0d76e9f9e62fec2554d832f8b (patch)
treecafd6e239817a413a8886ff1b56d8a3aa20faf46 /Lib/unittest/test/test_runner.py
parentb349e4c929131eb708ff3db569077f0c851338e9 (diff)
parent1241c47aa2af26d90be1fdb6b0990a08bf9beafd (diff)
downloadcpython-869778e520a6bdf0d76e9f9e62fec2554d832f8b.zip
cpython-869778e520a6bdf0d76e9f9e62fec2554d832f8b.tar.gz
cpython-869778e520a6bdf0d76e9f9e62fec2554d832f8b.tar.bz2
#22092: merge with 3.4.
Diffstat (limited to 'Lib/unittest/test/test_runner.py')
-rw-r--r--Lib/unittest/test/test_runner.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/unittest/test/test_runner.py b/Lib/unittest/test/test_runner.py
index ef1c1af9..7c0bd51 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):