From 695d4711442754d34e96c4a1c964905af96735ee 2013-09-04 02:48:01
From: Paul Ivanov <pi@berkeley.edu>
Date: 2013-09-04 02:48:01
Subject: [PATCH] clean up imports

---

diff --git a/IPython/core/tests/test_prefilter.py b/IPython/core/tests/test_prefilter.py
index eff88a4..b54abf0 100644
--- a/IPython/core/tests/test_prefilter.py
+++ b/IPython/core/tests/test_prefilter.py
@@ -6,7 +6,6 @@
 import nose.tools as nt
 
 from IPython.core.prefilter import AutocallChecker
-from IPython.testing import decorators as dec
 from IPython.testing.globalipapp import get_ipython
 
 #-----------------------------------------------------------------------------
diff --git a/IPython/kernel/tests/test_launcher.py b/IPython/kernel/tests/test_launcher.py
index 1fa43d8..0936790 100644
--- a/IPython/kernel/tests/test_launcher.py
+++ b/IPython/kernel/tests/test_launcher.py
@@ -20,7 +20,6 @@ Authors
 import nose.tools as nt
 
 # Our own imports
-from IPython.testing import decorators as dec
 from IPython.kernel.launcher import swallow_argv
 
 #-----------------------------------------------------------------------------
diff --git a/IPython/nbconvert/filters/tests/test_strings.py b/IPython/nbconvert/filters/tests/test_strings.py
index cb3cbdf..5c64c02 100644
--- a/IPython/nbconvert/filters/tests/test_strings.py
+++ b/IPython/nbconvert/filters/tests/test_strings.py
@@ -15,7 +15,6 @@ Module with tests for Strings
 #-----------------------------------------------------------------------------
 import os
 
-from IPython.testing import decorators as dec
 from ...tests.base import TestsBase
 from ..strings import (wrap_text, html2text, add_anchor, strip_dollars, 
     strip_files_prefix, get_lines, comment_lines, ipython2python, posix_path,
diff --git a/IPython/parallel/tests/test_magics.py b/IPython/parallel/tests/test_magics.py
index 4756bae..c8ec444 100644
--- a/IPython/parallel/tests/test_magics.py
+++ b/IPython/parallel/tests/test_magics.py
@@ -17,19 +17,14 @@ Authors:
 #-------------------------------------------------------------------------------
 
 import re
-import sys
 import time
 
-import zmq
-from nose import SkipTest
 
 from IPython.testing import decorators as dec
 from IPython.utils.io import capture_output
 
 from IPython import parallel  as pmod
-from IPython.parallel import error
 from IPython.parallel import AsyncResult
-from IPython.parallel.util import interactive
 
 from IPython.parallel.tests import add_engines
 
diff --git a/IPython/parallel/tests/test_view.py b/IPython/parallel/tests/test_view.py
index b344a80..3cc704e 100644
--- a/IPython/parallel/tests/test_view.py
+++ b/IPython/parallel/tests/test_view.py
@@ -22,10 +22,8 @@ import platform
 import time
 from collections import namedtuple
 from tempfile import mktemp
-from StringIO import StringIO
 
 import zmq
-from nose import SkipTest
 from nose.plugins.attrib import attr
 
 from IPython.testing import decorators as dec
@@ -34,7 +32,6 @@ from IPython.utils.io import capture_output
 from IPython import parallel  as pmod
 from IPython.parallel import error
 from IPython.parallel import AsyncResult, AsyncHubResult, AsyncMapResult
-from IPython.parallel import DirectView
 from IPython.parallel.util import interactive
 
 from IPython.parallel.tests import add_engines
@@ -241,7 +238,7 @@ class TestView(ClusterTestCase):
     @skip_without('numpy')
     def test_scatter_gather_numpy(self):
         import numpy
-        from numpy.testing.utils import assert_array_equal, assert_array_almost_equal
+        from numpy.testing.utils import assert_array_equal
         view = self.client[:]
         a = numpy.arange(64)
         view.scatter('a', a, block=True)
@@ -279,7 +276,7 @@ class TestView(ClusterTestCase):
     def test_apply_numpy(self):
         """view.apply(f, ndarray)"""
         import numpy
-        from numpy.testing.utils import assert_array_equal, assert_array_almost_equal
+        from numpy.testing.utils import assert_array_equal
         
         A = numpy.random.random((100,100))
         view = self.client[-1]
@@ -367,7 +364,7 @@ class TestView(ClusterTestCase):
     @skip_without('numpy')
     def test_scatter_gather_numpy_nonblocking(self):
         import numpy
-        from numpy.testing.utils import assert_array_equal, assert_array_almost_equal
+        from numpy.testing.utils import assert_array_equal
         a = numpy.arange(64)
         view = self.client[:]
         ar = view.scatter('a', a, block=False)
diff --git a/IPython/testing/ipunittest.py b/IPython/testing/ipunittest.py
index bfb6e6c..ae134f2 100644
--- a/IPython/testing/ipunittest.py
+++ b/IPython/testing/ipunittest.py
@@ -37,7 +37,6 @@ from __future__ import absolute_import
 
 # Stdlib
 import re
-import sys
 import unittest
 from doctest import DocTestFinder, DocTestRunner, TestResults