diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2014-07-31 14:30:10 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2014-07-31 14:30:10 -0600 |
| commit | ae7c942ced535fb39384aefeb8d32df92fb15988 (patch) | |
| tree | d06ae19daed6c32522e3a06fb27afb4490302d0d /numpy/lib/tests/test_arraysetops.py | |
| parent | 2ad538899928c249af456d93f250ebbd7535dcff (diff) | |
| parent | 01b0d7e82211b581aaff925e3ccc36cff9ac1895 (diff) | |
| download | numpy-ae7c942ced535fb39384aefeb8d32df92fb15988.tar.gz | |
Merge pull request #4929 from juliantaylor/charris-pep8-numpy-lib
Charris pep8 numpy lib
Diffstat (limited to 'numpy/lib/tests/test_arraysetops.py')
| -rw-r--r-- | numpy/lib/tests/test_arraysetops.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/numpy/lib/tests/test_arraysetops.py b/numpy/lib/tests/test_arraysetops.py index 271943abc..e83f8552e 100644 --- a/numpy/lib/tests/test_arraysetops.py +++ b/numpy/lib/tests/test_arraysetops.py @@ -3,11 +3,13 @@ """ from __future__ import division, absolute_import, print_function -from numpy.testing import * import numpy as np -from numpy.lib.arraysetops import * - -import warnings +from numpy.testing import ( + run_module_suite, TestCase, assert_array_equal + ) +from numpy.lib.arraysetops import ( + ediff1d, intersect1d, setxor1d, union1d, setdiff1d, unique, in1d + ) class TestSetOps(TestCase): @@ -94,8 +96,8 @@ class TestSetOps(TestCase): check_all(aa, bb, i1, i2, c, dt) # test for ticket #2799 - aa = [1.+0.j, 1- 1.j, 1] - assert_array_equal(np.unique(aa), [ 1.-1.j, 1.+0.j]) + aa = [1. + 0.j, 1 - 1.j, 1] + assert_array_equal(np.unique(aa), [1. - 1.j, 1. + 0.j]) # test for ticket #4785 a = [(1, 2), (1, 2), (2, 3)] |