STY: Giant comma spacing fixup.

Run the 2to3 ws_comma fixer on *.py files. Some lines are now too long
and will need to be broken at some point. OTOH, some lines were already
too long and need to be broken at some point. Now seems as good a time
as any to do this with open PRs at a minimum.

1 files changed, 80 insertions, 80 deletions

diff --git a/numpy/lib/tests/test_index_tricks.py b/numpy/lib/tests/test_index_tricks.py
index 01b705b5d..9002331ce 100644
--- a/numpy/lib/tests/test_index_tricks.py
+++ b/numpy/lib/tests/test_index_tricks.py
@@ -8,42 +8,42 @@ from numpy import ( array, ones, r_, mgrid, unravel_index, zeros, where,
 
 class TestRavelUnravelIndex(TestCase):
     def test_basic(self):
-        assert_equal(np.unravel_index(2,(2,2)), (1,0))
-        assert_equal(np.ravel_multi_index((1,0),(2,2)), 2)
-        assert_equal(np.unravel_index(254,(17,94)), (2,66))
-        assert_equal(np.ravel_multi_index((2,66),(17,94)), 254)
-        assert_raises(ValueError, np.unravel_index, -1, (2,2))
-        assert_raises(TypeError, np.unravel_index, 0.5, (2,2))
-        assert_raises(ValueError, np.unravel_index, 4, (2,2))
-        assert_raises(ValueError, np.ravel_multi_index, (-3,1), (2,2))
-        assert_raises(ValueError, np.ravel_multi_index, (2,1), (2,2))
-        assert_raises(ValueError, np.ravel_multi_index, (0,-3), (2,2))
-        assert_raises(ValueError, np.ravel_multi_index, (0,2), (2,2))
-        assert_raises(TypeError, np.ravel_multi_index, (0.1,0.), (2,2))
-
-        assert_equal(np.unravel_index((2*3 + 1)*6 + 4, (4,3,6)), [2,1,4])
-        assert_equal(np.ravel_multi_index([2,1,4], (4,3,6)), (2*3 + 1)*6 + 4)
-
-        arr = np.array([[3,6,6],[4,5,1]])
-        assert_equal(np.ravel_multi_index(arr, (7,6)), [22,41,37])
-        assert_equal(np.ravel_multi_index(arr, (7,6), order='F'), [31,41,13])
-        assert_equal(np.ravel_multi_index(arr, (4,6), mode='clip'), [22,23,19])
-        assert_equal(np.ravel_multi_index(arr, (4,4), mode=('clip','wrap')),
-                        [12,13,13])
-        assert_equal(np.ravel_multi_index((3,1,4,1), (6,7,8,9)), 1621)
-
-        assert_equal(np.unravel_index(np.array([22, 41, 37]), (7,6)),
-                        [[3, 6, 6],[4, 5, 1]])
-        assert_equal(np.unravel_index(np.array([31, 41, 13]), (7,6), order='F'),
+        assert_equal(np.unravel_index(2, (2, 2)), (1, 0))
+        assert_equal(np.ravel_multi_index((1, 0), (2, 2)), 2)
+        assert_equal(np.unravel_index(254, (17, 94)), (2, 66))
+        assert_equal(np.ravel_multi_index((2, 66), (17, 94)), 254)
+        assert_raises(ValueError, np.unravel_index, -1, (2, 2))
+        assert_raises(TypeError, np.unravel_index, 0.5, (2, 2))
+        assert_raises(ValueError, np.unravel_index, 4, (2, 2))
+        assert_raises(ValueError, np.ravel_multi_index, (-3, 1), (2, 2))
+        assert_raises(ValueError, np.ravel_multi_index, (2, 1), (2, 2))
+        assert_raises(ValueError, np.ravel_multi_index, (0, -3), (2, 2))
+        assert_raises(ValueError, np.ravel_multi_index, (0, 2), (2, 2))
+        assert_raises(TypeError, np.ravel_multi_index, (0.1, 0.), (2, 2))
+
+        assert_equal(np.unravel_index((2*3 + 1)*6 + 4, (4, 3, 6)), [2, 1, 4])
+        assert_equal(np.ravel_multi_index([2, 1, 4], (4, 3, 6)), (2*3 + 1)*6 + 4)
+
+        arr = np.array([[3, 6, 6], [4, 5, 1]])
+        assert_equal(np.ravel_multi_index(arr, (7, 6)), [22, 41, 37])
+        assert_equal(np.ravel_multi_index(arr, (7, 6), order='F'), [31, 41, 13])
+        assert_equal(np.ravel_multi_index(arr, (4, 6), mode='clip'), [22, 23, 19])
+        assert_equal(np.ravel_multi_index(arr, (4, 4), mode=('clip', 'wrap')),
+                        [12, 13, 13])
+        assert_equal(np.ravel_multi_index((3, 1, 4, 1), (6, 7, 8, 9)), 1621)
+
+        assert_equal(np.unravel_index(np.array([22, 41, 37]), (7, 6)),
                         [[3, 6, 6], [4, 5, 1]])
-        assert_equal(np.unravel_index(1621, (6,7,8,9)), [3,1,4,1])
+        assert_equal(np.unravel_index(np.array([31, 41, 13]), (7, 6), order='F'),
+                        [[3, 6, 6], [4, 5, 1]])
+        assert_equal(np.unravel_index(1621, (6, 7, 8, 9)), [3, 1, 4, 1])
 
     def test_dtypes(self):
         # Test with different data types
         for dtype in [np.int16, np.uint16, np.int32,
                       np.uint32, np.int64, np.uint64]:
-            coords = np.array([[1,0,1,2,3,4],[1,6,1,3,2,0]], dtype=dtype)
-            shape = (5,8)
+            coords = np.array([[1, 0, 1, 2, 3, 4], [1, 6, 1, 3, 2, 0]], dtype=dtype)
+            shape = (5, 8)
             uncoords = 8*coords[0]+coords[1]
             assert_equal(np.ravel_multi_index(coords, shape), uncoords)
             assert_equal(coords, np.unravel_index(uncoords, shape))
@@ -51,9 +51,9 @@ class TestRavelUnravelIndex(TestCase):
             assert_equal(np.ravel_multi_index(coords, shape, order='F'), uncoords)
             assert_equal(coords, np.unravel_index(uncoords, shape, order='F'))
 
-            coords = np.array([[1,0,1,2,3,4],[1,6,1,3,2,0],[1,3,1,0,9,5]],
+            coords = np.array([[1, 0, 1, 2, 3, 4], [1, 6, 1, 3, 2, 0], [1, 3, 1, 0, 9, 5]],
                               dtype=dtype)
-            shape = (5,8,10)
+            shape = (5, 8, 10)
             uncoords = 10*(8*coords[0]+coords[1])+coords[2]
             assert_equal(np.ravel_multi_index(coords, shape), uncoords)
             assert_equal(coords, np.unravel_index(uncoords, shape))
@@ -63,12 +63,12 @@ class TestRavelUnravelIndex(TestCase):
 
     def test_clipmodes(self):
         # Test clipmodes
-        assert_equal(np.ravel_multi_index([5,1,-1,2], (4,3,7,12), mode='wrap'),
-                     np.ravel_multi_index([1,1,6,2], (4,3,7,12)))
-        assert_equal(np.ravel_multi_index([5,1,-1,2], (4,3,7,12),
-                                 mode=('wrap','raise','clip','raise')),
-                     np.ravel_multi_index([1,1,0,2], (4,3,7,12)))
-        assert_raises(ValueError, np.ravel_multi_index, [5,1,-1,2], (4,3,7,12))
+        assert_equal(np.ravel_multi_index([5, 1, -1, 2], (4, 3, 7, 12), mode='wrap'),
+                     np.ravel_multi_index([1, 1, 6, 2], (4, 3, 7, 12)))
+        assert_equal(np.ravel_multi_index([5, 1, -1, 2], (4, 3, 7, 12),
+                                 mode=('wrap', 'raise', 'clip', 'raise')),
+                     np.ravel_multi_index([1, 1, 0, 2], (4, 3, 7, 12)))
+        assert_raises(ValueError, np.ravel_multi_index, [5, 1, -1, 2], (4, 3, 7, 12))
 
 class TestGrid(TestCase):
     def test_basic(self):
@@ -77,63 +77,63 @@ class TestGrid(TestCase):
         assert_(a.shape == (10,))
         assert_(b.shape == (20,))
         assert_(a[0] == -1)
-        assert_almost_equal(a[-1],1)
+        assert_almost_equal(a[-1], 1)
         assert_(b[0] == -1)
-        assert_almost_equal(b[1]-b[0],0.1,11)
-        assert_almost_equal(b[-1],b[0]+19*0.1,11)
-        assert_almost_equal(a[1]-a[0],2.0/9.0,11)
+        assert_almost_equal(b[1]-b[0], 0.1, 11)
+        assert_almost_equal(b[-1], b[0]+19*0.1, 11)
+        assert_almost_equal(a[1]-a[0], 2.0/9.0, 11)
 
     def test_linspace_equivalence(self):
-        y,st = np.linspace(2,10,retstep=1)
-        assert_almost_equal(st,8/49.0)
-        assert_array_almost_equal(y,mgrid[2:10:50j],13)
+        y, st = np.linspace(2, 10, retstep=1)
+        assert_almost_equal(st, 8/49.0)
+        assert_array_almost_equal(y, mgrid[2:10:50j], 13)
 
     def test_nd(self):
-        c = mgrid[-1:1:10j,-2:2:10j]
-        d = mgrid[-1:1:0.1,-2:2:0.2]
-        assert_(c.shape == (2,10,10))
-        assert_(d.shape == (2,20,20))
-        assert_array_equal(c[0][0,:],-ones(10,'d'))
-        assert_array_equal(c[1][:,0],-2*ones(10,'d'))
-        assert_array_almost_equal(c[0][-1,:],ones(10,'d'),11)
-        assert_array_almost_equal(c[1][:,-1],2*ones(10,'d'),11)
-        assert_array_almost_equal(d[0,1,:]-d[0,0,:], 0.1*ones(20,'d'),11)
-        assert_array_almost_equal(d[1,:,1]-d[1,:,0], 0.2*ones(20,'d'),11)
+        c = mgrid[-1:1:10j, -2:2:10j]
+        d = mgrid[-1:1:0.1, -2:2:0.2]
+        assert_(c.shape == (2, 10, 10))
+        assert_(d.shape == (2, 20, 20))
+        assert_array_equal(c[0][0,:], -ones(10, 'd'))
+        assert_array_equal(c[1][:, 0], -2*ones(10, 'd'))
+        assert_array_almost_equal(c[0][-1,:], ones(10, 'd'), 11)
+        assert_array_almost_equal(c[1][:, -1], 2*ones(10, 'd'), 11)
+        assert_array_almost_equal(d[0, 1,:]-d[0, 0,:], 0.1*ones(20, 'd'), 11)
+        assert_array_almost_equal(d[1,:, 1]-d[1,:, 0], 0.2*ones(20, 'd'), 11)
 
 
 class TestConcatenator(TestCase):
     def test_1d(self):
-        assert_array_equal(r_[1,2,3,4,5,6],array([1,2,3,4,5,6]))
+        assert_array_equal(r_[1, 2, 3, 4, 5, 6], array([1, 2, 3, 4, 5, 6]))
         b = ones(5)
-        c = r_[b,0,0,b]
-        assert_array_equal(c,[1,1,1,1,1,0,0,1,1,1,1,1])
+        c = r_[b, 0, 0, b]
+        assert_array_equal(c, [1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1])
 
     def test_mixed_type(self):
         g = r_[10.1, 1:10]
         assert_(g.dtype == 'f8')
 
     def test_more_mixed_type(self):
-        g = r_[-10.1, array([1]), array([2,3,4]), 10.0]
+        g = r_[-10.1, array([1]), array([2, 3, 4]), 10.0]
         assert_(g.dtype == 'f8')
 
     def test_2d(self):
-        b = rand(5,5)
-        c = rand(5,5)
-        d = r_['1',b,c]  # append columns
-        assert_(d.shape == (5,10))
-        assert_array_equal(d[:,:5],b)
-        assert_array_equal(d[:,5:],c)
-        d = r_[b,c]
-        assert_(d.shape == (10,5))
-        assert_array_equal(d[:5,:],b)
-        assert_array_equal(d[5:,:],c)
+        b = rand(5, 5)
+        c = rand(5, 5)
+        d = r_['1', b, c]  # append columns
+        assert_(d.shape == (5, 10))
+        assert_array_equal(d[:, :5], b)
+        assert_array_equal(d[:, 5:], c)
+        d = r_[b, c]
+        assert_(d.shape == (10, 5))
+        assert_array_equal(d[:5,:], b)
+        assert_array_equal(d[5:,:], c)
 
 
 class TestNdenumerate(TestCase):
     def test_basic(self):
-        a = array([[1,2], [3,4]])
+        a = array([[1, 2], [3, 4]])
         assert_equal(list(ndenumerate(a)),
-                     [((0,0), 1), ((0,1), 2), ((1,0), 3), ((1,1), 4)])
+                     [((0, 0), 1), ((0, 1), 2), ((1, 0), 3), ((1, 1), 4)])
 
 
 class TestIndexExpression(TestCase):
@@ -144,17 +144,17 @@ class TestIndexExpression(TestCase):
         assert_equal(a[:-1], a[index_exp[:-1]])
 
     def test_simple_1(self):
-        a = np.random.rand(4,5,6)
+        a = np.random.rand(4, 5, 6)
 
-        assert_equal(a[:,:3,[1,2]], a[index_exp[:,:3,[1,2]]])
-        assert_equal(a[:,:3,[1,2]], a[s_[:,:3,[1,2]]])
+        assert_equal(a[:, :3, [1, 2]], a[index_exp[:, :3, [1, 2]]])
+        assert_equal(a[:, :3, [1, 2]], a[s_[:, :3, [1, 2]]])
 
 def test_c_():
-    a = np.c_[np.array([[1,2,3]]), 0, 0, np.array([[4,5,6]])]
+    a = np.c_[np.array([[1, 2, 3]]), 0, 0, np.array([[4, 5, 6]])]
     assert_equal(a, [[1, 2, 3, 0, 0, 4, 5, 6]])
 
 def test_fill_diagonal():
-    a = zeros((3, 3),int)
+    a = zeros((3, 3), int)
     fill_diagonal(a, 5)
     yield (assert_array_equal, a,
            array([[5, 0, 0],
@@ -162,7 +162,7 @@ def test_fill_diagonal():
                   [0, 0, 5]]))
 
     #Test tall matrix
-    a = zeros((10, 3),int)
+    a = zeros((10, 3), int)
     fill_diagonal(a, 5)
     yield (assert_array_equal, a,
            array([[5, 0, 0],
@@ -177,7 +177,7 @@ def test_fill_diagonal():
                   [0, 0, 0]]))
 
     #Test tall matrix wrap
-    a = zeros((10, 3),int)
+    a = zeros((10, 3), int)
     fill_diagonal(a, 5, True)
     yield (assert_array_equal, a,
            array([[5, 0, 0],
@@ -192,7 +192,7 @@ def test_fill_diagonal():
                   [0, 5, 0]]))
 
     #Test wide matrix
-    a = zeros((3, 10),int)
+    a = zeros((3, 10), int)
     fill_diagonal(a, 5)
     yield (assert_array_equal, a,
            array([[5, 0, 0, 0, 0, 0, 0, 0, 0, 0],
@@ -223,7 +223,7 @@ def test_diag_indices():
     d3 = diag_indices(2, 3)
 
     # And use it to set the diagonal of a zeros array to 1:
-    a = zeros((2, 2, 2),int)
+    a = zeros((2, 2, 2), int)
     a[d3] = 1
     yield (assert_array_equal, a,
            array([[[1, 0],