numpy
diff --git a/‎numpy/lib/tests/test_recfunctions.py‎
Lines changed: 36 additions & 48 deletions b/‎numpy/lib/tests/test_recfunctions.py‎
Lines changed: 36 additions & 48 deletions
@@ -1,4 +1,3 @@
-
 import numpy as np
 import numpy.ma as ma
 from numpy.lib.recfunctions import (
@@ -31,19 +30,14 @@
 
 class TestRecFunctions:
     # Misc tests
-
-    def setup_method(self):
+    def test_zip_descr(self):
+        # Test zip_descr
         x = np.array([1, 2, ])
         y = np.array([10, 20, 30])
         z = np.array([('A', 1.), ('B', 2.)],
                      dtype=[('A', '|S3'), ('B', float)])
         w = np.array([(1, (2, 3.0)), (4, (5, 6.0))],
                      dtype=[('a', int), ('b', [('ba', float), ('bb', int)])])
-        self.data = (w, x, y, z)
-
-    def test_zip_descr(self):
-        # Test zip_descr
-        (w, x, y, z) = self.data
 
         # Std array
         test = zip_descr((x, x), flatten=True)
@@ -448,19 +442,19 @@ def test_masked_flexible(self):
 class TestMergeArrays:
     # Test merge_arrays
 
-    def setup_method(self):
+    def _create_arrays(self):
         x = np.array([1, 2, ])
         y = np.array([10, 20, 30])
         z = np.array(
             [('A', 1.), ('B', 2.)], dtype=[('A', '|S3'), ('B', float)])
         w = np.array(
             [(1, (2, 3.0, ())), (4, (5, 6.0, ()))],
             dtype=[('a', int), ('b', [('ba', float), ('bb', int), ('bc', [])])])
-        self.data = (w, x, y, z)
+        return w, x, y, z
 
     def test_solo(self):
         # Test merge_arrays on a single array.
-        (_, x, _, z) = self.data
+        _, x, _, z = self._create_arrays()
 
         test = merge_arrays(x)
         control = np.array([(1,), (2,)], dtype=[('f0', int)])
@@ -475,7 +469,7 @@ def test_solo(self):
 
     def test_solo_w_flatten(self):
         # Test merge_arrays on a single array w & w/o flattening
-        w = self.data[0]
+        w = self._create_arrays()[0]
         test = merge_arrays(w, flatten=False)
         assert_equal(test, w)
 
@@ -487,7 +481,7 @@ def test_solo_w_flatten(self):
     def test_standard(self):
         # Test standard & standard
         # Test merge arrays
-        (_, x, y, _) = self.data
+        _, x, y, _ = self._create_arrays()
         test = merge_arrays((x, y), usemask=False)
         control = np.array([(1, 10), (2, 20), (-1, 30)],
                            dtype=[('f0', int), ('f1', int)])
@@ -502,7 +496,7 @@ def test_standard(self):
 
     def test_flatten(self):
         # Test standard & flexible
-        (_, x, _, z) = self.data
+        _, x, _, z = self._create_arrays()
         test = merge_arrays((x, z), flatten=True)
         control = np.array([(1, 'A', 1.), (2, 'B', 2.)],
                            dtype=[('f0', int), ('A', '|S3'), ('B', float)])
@@ -516,7 +510,7 @@ def test_flatten(self):
 
     def test_flatten_wflexible(self):
         # Test flatten standard & nested
-        (w, x, _, _) = self.data
+        w, x, _, _ = self._create_arrays()
         test = merge_arrays((x, w), flatten=True)
         control = np.array([(1, 1, 2, 3.0), (2, 4, 5, 6.0)],
                            dtype=[('f0', int),
@@ -532,7 +526,7 @@ def test_flatten_wflexible(self):
 
     def test_wmasked_arrays(self):
         # Test merge_arrays masked arrays
-        (_, x, _, _) = self.data
+        x = self._create_arrays()[1]
         mx = ma.array([1, 2, 3], mask=[1, 0, 0])
         test = merge_arrays((x, mx), usemask=True)
         control = ma.array([(1, 1), (2, 2), (-1, 3)],
@@ -554,7 +548,7 @@ def test_w_singlefield(self):
 
     def test_w_shorter_flex(self):
         # Test merge_arrays w/ a shorter flexndarray.
-        z = self.data[-1]
+        z = self._create_arrays()[-1]
 
         # Fixme, this test looks incomplete and broken
         #test = merge_arrays((z, np.array([10, 20, 30]).view([('C', int)])))
@@ -567,7 +561,7 @@ def test_w_shorter_flex(self):
                  dtype=[('A', '|S3'), ('B', float), ('C', int)])
 
     def test_singlerecord(self):
-        (_, x, y, z) = self.data
+        _, x, y, z = self._create_arrays()
         test = merge_arrays((x[0], y[0], z[0]), usemask=False)
         control = np.array([(1, 10, ('A', 1))],
                            dtype=[('f0', int),
@@ -579,18 +573,18 @@ def test_singlerecord(self):
 class TestAppendFields:
     # Test append_fields
 
-    def setup_method(self):
+    def _create_arrays(self):
         x = np.array([1, 2, ])
         y = np.array([10, 20, 30])
         z = np.array(
             [('A', 1.), ('B', 2.)], dtype=[('A', '|S3'), ('B', float)])
         w = np.array([(1, (2, 3.0)), (4, (5, 6.0))],
                      dtype=[('a', int), ('b', [('ba', float), ('bb', int)])])
-        self.data = (w, x, y, z)
+        return w, x, y, z
 
     def test_append_single(self):
         # Test simple case
-        (_, x, _, _) = self.data
+        x = self._create_arrays()[1]
         test = append_fields(x, 'A', data=[10, 20, 30])
         control = ma.array([(1, 10), (2, 20), (-1, 30)],
                            mask=[(0, 0), (0, 0), (1, 0)],
@@ -599,7 +593,7 @@ def test_append_single(self):
 
     def test_append_double(self):
         # Test simple case
-        (_, x, _, _) = self.data
+        x = self._create_arrays()[1]
         test = append_fields(x, ('A', 'B'), data=[[10, 20, 30], [100, 200]])
         control = ma.array([(1, 10, 100), (2, 20, 200), (-1, 30, -1)],
                            mask=[(0, 0, 0), (0, 0, 0), (1, 0, 1)],
@@ -608,7 +602,7 @@ def test_append_double(self):
 
     def test_append_on_flex(self):
         # Test append_fields on flexible type arrays
-        z = self.data[-1]
+        z = self._create_arrays()[-1]
         test = append_fields(z, 'C', data=[10, 20, 30])
         control = ma.array([('A', 1., 10), ('B', 2., 20), (-1, -1., 30)],
                            mask=[(0, 0, 0), (0, 0, 0), (1, 1, 0)],
@@ -617,7 +611,7 @@ def test_append_on_flex(self):
 
     def test_append_on_nested(self):
         # Test append_fields on nested fields
-        w = self.data[0]
+        w = self._create_arrays()[0]
         test = append_fields(w, 'C', data=[10, 20, 30])
         control = ma.array([(1, (2, 3.0), 10),
                             (4, (5, 6.0), 20),
@@ -632,18 +626,18 @@ def test_append_on_nested(self):
 
 class TestStackArrays:
     # Test stack_arrays
-    def setup_method(self):
+    def _create_arrays(self):
         x = np.array([1, 2, ])
         y = np.array([10, 20, 30])
         z = np.array(
             [('A', 1.), ('B', 2.)], dtype=[('A', '|S3'), ('B', float)])
         w = np.array([(1, (2, 3.0)), (4, (5, 6.0))],
                      dtype=[('a', int), ('b', [('ba', float), ('bb', int)])])
-        self.data = (w, x, y, z)
+        return w, x, y, z
 
     def test_solo(self):
         # Test stack_arrays on single arrays
-        (_, x, _, _) = self.data
+        x = self._create_arrays()[1]
         test = stack_arrays((x,))
         assert_equal(test, x)
         assert_(test is x)
@@ -654,7 +648,7 @@ def test_solo(self):
 
     def test_unnamed_fields(self):
         # Tests combinations of arrays w/o named fields
-        (_, x, y, _) = self.data
+        _, x, y, _ = self._create_arrays()
 
         test = stack_arrays((x, x), usemask=False)
         control = np.array([1, 2, 1, 2])
@@ -670,7 +664,7 @@ def test_unnamed_fields(self):
 
     def test_unnamed_and_named_fields(self):
         # Test combination of arrays w/ & w/o named fields
-        (_, x, _, z) = self.data
+        _, x, _, z = self._create_arrays()
 
         test = stack_arrays((x, z))
         control = ma.array([(1, -1, -1), (2, -1, -1),
@@ -702,7 +696,7 @@ def test_unnamed_and_named_fields(self):
 
     def test_matching_named_fields(self):
         # Test combination of arrays w/ matching field names
-        (_, x, _, z) = self.data
+        _, x, _, z = self._create_arrays()
         zz = np.array([('a', 10., 100.), ('b', 20., 200.), ('c', 30., 300.)],
                       dtype=[('A', '|S3'), ('B', float), ('C', float)])
         test = stack_arrays((z, zz))
@@ -730,7 +724,7 @@ def test_matching_named_fields(self):
 
     def test_defaults(self):
         # Test defaults: no exception raised if keys of defaults are not fields.
-        (_, _, _, z) = self.data
+        z = self._create_arrays()[-1]
         zz = np.array([('a', 10., 100.), ('b', 20., 200.), ('c', 30., 300.)],
                       dtype=[('A', '|S3'), ('B', float), ('C', float)])
         defaults = {'A': '???', 'B': -999., 'C': -9999., 'D': -99999.}
@@ -802,18 +796,18 @@ def test_subdtype(self):
 
 
 class TestJoinBy:
-    def setup_method(self):
-        self.a = np.array(list(zip(np.arange(10), np.arange(50, 60),
+    def _create_arrays(self):
+        a = np.array(list(zip(np.arange(10), np.arange(50, 60),
                                    np.arange(100, 110))),
                           dtype=[('a', int), ('b', int), ('c', int)])
-        self.b = np.array(list(zip(np.arange(5, 15), np.arange(65, 75),
+        b = np.array(list(zip(np.arange(5, 15), np.arange(65, 75),
                                    np.arange(100, 110))),
                           dtype=[('a', int), ('b', int), ('d', int)])
+        return a, b
 
     def test_inner_join(self):
         # Basic test of join_by
-        a, b = self.a, self.b
-
+        a, b = self._create_arrays()
         test = join_by('a', a, b, jointype='inner')
         control = np.array([(5, 55, 65, 105, 100), (6, 56, 66, 106, 101),
                             (7, 57, 67, 107, 102), (8, 58, 68, 108, 103),
@@ -823,8 +817,7 @@ def test_inner_join(self):
         assert_equal(test, control)
 
     def test_join(self):
-        a, b = self.a, self.b
-
+        a, b = self._create_arrays()
         # Fixme, this test is broken
         #test = join_by(('a', 'b'), a, b)
         #control = np.array([(5, 55, 105, 100), (6, 56, 106, 101),
@@ -833,7 +826,6 @@ def test_join(self):
         #                   dtype=[('a', int), ('b', int),
         #                          ('c', int), ('d', int)])
         #assert_equal(test, control)
-
         join_by(('a', 'b'), a, b)
         np.array([(5, 55, 105, 100), (6, 56, 106, 101),
                   (7, 57, 107, 102), (8, 58, 108, 103),
@@ -851,8 +843,7 @@ def test_join_subdtype(self):
         assert_equal(res, bar.view(ma.MaskedArray))
 
     def test_outer_join(self):
-        a, b = self.a, self.b
-
+        a, b = self._create_arrays()
         test = join_by(('a', 'b'), a, b, 'outer')
         control = ma.array([(0, 50, 100, -1), (1, 51, 101, -1),
                             (2, 52, 102, -1), (3, 53, 103, -1),
@@ -879,8 +870,7 @@ def test_outer_join(self):
         assert_equal(test, control)
 
     def test_leftouter_join(self):
-        a, b = self.a, self.b
-
+        a, b = self._create_arrays()
         test = join_by(('a', 'b'), a, b, 'leftouter')
         control = ma.array([(0, 50, 100, -1), (1, 51, 101, -1),
                             (2, 52, 102, -1), (3, 53, 103, -1),
@@ -1029,19 +1019,17 @@ def test_two_keys_two_vars(self):
         assert_equal(test.dtype, control.dtype)
         assert_equal(test, control)
 
+
 class TestAppendFieldsObj:
     """
     Test append_fields with arrays containing objects
     """
     # https://github.com/numpy/numpy/issues/2346
 
-    def setup_method(self):
-        from datetime import date
-        self.data = {'obj': date(2000, 1, 1)}
-
     def test_append_to_objects(self):
         "Test append_fields when the base array contains objects"
-        obj = self.data['obj']
+        from datetime import date
+        obj = date(2000, 1, 1)
         x = np.array([(obj, 1.), (obj, 2.)],
                       dtype=[('A', object), ('B', float)])
         y = np.array([10, 20], dtype=int)