Show More
@@ -48,7 +48,6 b' Authors' | |||||
48 | #----------------------------------------------------------------------------- |
|
48 | #----------------------------------------------------------------------------- | |
49 |
|
49 | |||
50 | # Stdlib imports |
|
50 | # Stdlib imports | |
51 | import inspect |
|
|||
52 | import sys |
|
51 | import sys | |
53 | import tempfile |
|
52 | import tempfile | |
54 | import unittest |
|
53 | import unittest | |
@@ -60,9 +59,9 b' from IPython.external.decorator import decorator' | |||||
60 |
|
59 | |||
61 | # We already have python3-compliant code for parametric tests |
|
60 | # We already have python3-compliant code for parametric tests | |
62 | if sys.version[0]=='2': |
|
61 | if sys.version[0]=='2': | |
63 |
from _paramtestpy2 import parametric |
|
62 | from _paramtestpy2 import parametric | |
64 | else: |
|
63 | else: | |
65 |
from _paramtestpy3 import parametric |
|
64 | from _paramtestpy3 import parametric | |
66 |
|
65 | |||
67 | # Expose the unittest-driven decorators |
|
66 | # Expose the unittest-driven decorators | |
68 | from ipunittest import ipdoctest, ipdocstring |
|
67 | from ipunittest import ipdoctest, ipdocstring |
@@ -57,7 +57,7 b' from nose.core import TestProgram' | |||||
57 | from IPython.utils import py3compat |
|
57 | from IPython.utils import py3compat | |
58 | from IPython.utils.importstring import import_item |
|
58 | from IPython.utils.importstring import import_item | |
59 | from IPython.utils.path import get_ipython_module_path, get_ipython_package_dir |
|
59 | from IPython.utils.path import get_ipython_module_path, get_ipython_package_dir | |
60 |
from IPython.utils.process import |
|
60 | from IPython.utils.process import pycmd2argv | |
61 | from IPython.utils.sysinfo import sys_info |
|
61 | from IPython.utils.sysinfo import sys_info | |
62 | from IPython.utils.tempdir import TemporaryDirectory |
|
62 | from IPython.utils.tempdir import TemporaryDirectory | |
63 | from IPython.utils.warn import warn |
|
63 | from IPython.utils.warn import warn |
@@ -5,7 +5,6 b'' | |||||
5 | # Std lib |
|
5 | # Std lib | |
6 | import inspect |
|
6 | import inspect | |
7 | import sys |
|
7 | import sys | |
8 | import unittest |
|
|||
9 |
|
8 | |||
10 | # Third party |
|
9 | # Third party | |
11 | import nose.tools as nt |
|
10 | import nose.tools as nt |
@@ -16,7 +16,6 b' Tests for testing.tools' | |||||
16 | from __future__ import with_statement |
|
16 | from __future__ import with_statement | |
17 |
|
17 | |||
18 | import os |
|
18 | import os | |
19 | import sys |
|
|||
20 | import unittest |
|
19 | import unittest | |
21 |
|
20 | |||
22 | import nose.tools as nt |
|
21 | import nose.tools as nt | |
@@ -122,7 +121,7 b' class Test_ipexec_validate(unittest.TestCase, tt.TempFileMixin):' | |||||
122 | out = "A\nB" |
|
121 | out = "A\nB" | |
123 | tt.ipexec_validate(self.fname, expected_out=out, expected_err="C\nD") |
|
122 | tt.ipexec_validate(self.fname, expected_out=out, expected_err="C\nD") | |
124 |
|
123 | |||
125 | def test_exception_path(self): |
|
124 | def test_exception_path2(self): | |
126 | """Test exception path in exception_validate, expecting windows line endings. |
|
125 | """Test exception path in exception_validate, expecting windows line endings. | |
127 | """ |
|
126 | """ | |
128 | self.mktmp("from __future__ import print_function\n" |
|
127 | self.mktmp("from __future__ import print_function\n" |
General Comments 0
You need to be logged in to leave comments.
Login now