diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py index 28d368f..8be326e 100644 --- a/IPython/testing/decorators.py +++ b/IPython/testing/decorators.py @@ -48,7 +48,6 @@ Authors #----------------------------------------------------------------------------- # Stdlib imports -import inspect import sys import tempfile import unittest @@ -60,9 +59,9 @@ from IPython.external.decorator import decorator # We already have python3-compliant code for parametric tests if sys.version[0]=='2': - from _paramtestpy2 import parametric, ParametricTestCase + from _paramtestpy2 import parametric else: - from _paramtestpy3 import parametric, ParametricTestCase + from _paramtestpy3 import parametric # Expose the unittest-driven decorators from ipunittest import ipdoctest, ipdocstring diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py index c2b7bee..d05fd4e 100644 --- a/IPython/testing/iptest.py +++ b/IPython/testing/iptest.py @@ -57,7 +57,7 @@ from nose.core import TestProgram from IPython.utils import py3compat from IPython.utils.importstring import import_item from IPython.utils.path import get_ipython_module_path, get_ipython_package_dir -from IPython.utils.process import find_cmd, pycmd2argv +from IPython.utils.process import pycmd2argv from IPython.utils.sysinfo import sys_info from IPython.utils.tempdir import TemporaryDirectory from IPython.utils.warn import warn diff --git a/IPython/testing/tests/test_decorators.py b/IPython/testing/tests/test_decorators.py index a859155..cb87d2f 100644 --- a/IPython/testing/tests/test_decorators.py +++ b/IPython/testing/tests/test_decorators.py @@ -5,7 +5,6 @@ # Std lib import inspect import sys -import unittest # Third party import nose.tools as nt diff --git a/IPython/testing/tests/test_tools.py b/IPython/testing/tests/test_tools.py index 7beb1f0..d821878 100644 --- a/IPython/testing/tests/test_tools.py +++ b/IPython/testing/tests/test_tools.py @@ -16,7 +16,6 @@ Tests for testing.tools from __future__ import with_statement import os -import sys import unittest import nose.tools as nt @@ -122,7 +121,7 @@ class Test_ipexec_validate(unittest.TestCase, tt.TempFileMixin): out = "A\nB" tt.ipexec_validate(self.fname, expected_out=out, expected_err="C\nD") - def test_exception_path(self): + def test_exception_path2(self): """Test exception path in exception_validate, expecting windows line endings. """ self.mktmp("from __future__ import print_function\n"