##// END OF EJS Templates
clean up imports
Paul Ivanov -
Show More
@@ -6,7 +6,6 b''
6 6 import nose.tools as nt
7 7
8 8 from IPython.core.prefilter import AutocallChecker
9 from IPython.testing import decorators as dec
10 9 from IPython.testing.globalipapp import get_ipython
11 10
12 11 #-----------------------------------------------------------------------------
@@ -20,7 +20,6 b' Authors'
20 20 import nose.tools as nt
21 21
22 22 # Our own imports
23 from IPython.testing import decorators as dec
24 23 from IPython.kernel.launcher import swallow_argv
25 24
26 25 #-----------------------------------------------------------------------------
@@ -15,7 +15,6 b' Module with tests for Strings'
15 15 #-----------------------------------------------------------------------------
16 16 import os
17 17
18 from IPython.testing import decorators as dec
19 18 from ...tests.base import TestsBase
20 19 from ..strings import (wrap_text, html2text, add_anchor, strip_dollars,
21 20 strip_files_prefix, get_lines, comment_lines, ipython2python, posix_path,
@@ -17,19 +17,14 b' Authors:'
17 17 #-------------------------------------------------------------------------------
18 18
19 19 import re
20 import sys
21 20 import time
22 21
23 import zmq
24 from nose import SkipTest
25 22
26 23 from IPython.testing import decorators as dec
27 24 from IPython.utils.io import capture_output
28 25
29 26 from IPython import parallel as pmod
30 from IPython.parallel import error
31 27 from IPython.parallel import AsyncResult
32 from IPython.parallel.util import interactive
33 28
34 29 from IPython.parallel.tests import add_engines
35 30
@@ -22,10 +22,8 b' import platform'
22 22 import time
23 23 from collections import namedtuple
24 24 from tempfile import mktemp
25 from StringIO import StringIO
26 25
27 26 import zmq
28 from nose import SkipTest
29 27 from nose.plugins.attrib import attr
30 28
31 29 from IPython.testing import decorators as dec
@@ -34,7 +32,6 b' from IPython.utils.io import capture_output'
34 32 from IPython import parallel as pmod
35 33 from IPython.parallel import error
36 34 from IPython.parallel import AsyncResult, AsyncHubResult, AsyncMapResult
37 from IPython.parallel import DirectView
38 35 from IPython.parallel.util import interactive
39 36
40 37 from IPython.parallel.tests import add_engines
@@ -241,7 +238,7 b' class TestView(ClusterTestCase):'
241 238 @skip_without('numpy')
242 239 def test_scatter_gather_numpy(self):
243 240 import numpy
244 from numpy.testing.utils import assert_array_equal, assert_array_almost_equal
241 from numpy.testing.utils import assert_array_equal
245 242 view = self.client[:]
246 243 a = numpy.arange(64)
247 244 view.scatter('a', a, block=True)
@@ -279,7 +276,7 b' class TestView(ClusterTestCase):'
279 276 def test_apply_numpy(self):
280 277 """view.apply(f, ndarray)"""
281 278 import numpy
282 from numpy.testing.utils import assert_array_equal, assert_array_almost_equal
279 from numpy.testing.utils import assert_array_equal
283 280
284 281 A = numpy.random.random((100,100))
285 282 view = self.client[-1]
@@ -367,7 +364,7 b' class TestView(ClusterTestCase):'
367 364 @skip_without('numpy')
368 365 def test_scatter_gather_numpy_nonblocking(self):
369 366 import numpy
370 from numpy.testing.utils import assert_array_equal, assert_array_almost_equal
367 from numpy.testing.utils import assert_array_equal
371 368 a = numpy.arange(64)
372 369 view = self.client[:]
373 370 ar = view.scatter('a', a, block=False)
@@ -37,7 +37,6 b' from __future__ import absolute_import'
37 37
38 38 # Stdlib
39 39 import re
40 import sys
41 40 import unittest
42 41 from doctest import DocTestFinder, DocTestRunner, TestResults
43 42
General Comments 0
You need to be logged in to leave comments. Login now