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