diff options
| -rw-r--r-- | numpy/core/_internal.py | 8 | ||||
| -rw-r--r-- | numpy/core/tests/test_records.py | 9 |
2 files changed, 3 insertions, 14 deletions
diff --git a/numpy/core/_internal.py b/numpy/core/_internal.py index 1785f63a9..67ca1716f 100644 --- a/numpy/core/_internal.py +++ b/numpy/core/_internal.py @@ -335,13 +335,7 @@ def _newnames(datatype, order): def _index_fields(ary, fields): from multiarray import empty, dtype dt = ary.dtype - new_dtype = [(name, dt[name]) for name in dt.names if name in fields] - future_dtype = [(name, dt[name]) for name in fields if name in dt.names] - if not new_dtype == future_dtype: - depdoc = "Out of order field selection on recarrays currently returns \ -fields in order. This behavior is deprecated in numpy 1.5 and will change in \ -2.0. See ticket #1431." - warnings.warn(depdoc, DeprecationWarning) + new_dtype = [(name, dt[name]) for name in fields if name in dt.names] if ary.flags.f_contiguous: order = 'F' else: diff --git a/numpy/core/tests/test_records.py b/numpy/core/tests/test_records.py index 365014f11..7836b2a93 100644 --- a/numpy/core/tests/test_records.py +++ b/numpy/core/tests/test_records.py @@ -135,16 +135,11 @@ class TestRecord(TestCase): self.assertRaises(AttributeError, assign_invalid_column, a) def test_out_of_order_fields(self): - """Ticket #1431. Current behavior deprecated in numpy 1.5""" + """Ticket #1431.""" x = self.data[['col1', 'col2']] y = self.data[['col2', 'col1']] - # make sure change is applied in 1.6/2.0 - if np.version.short_version[:3] == '1.5': - assert_array_equal(x, y) - elif float(np.version.short_version[:3]) >= 1.6 and np.version.release: - assert_(y[0][0] == 4) + assert_equal(x[0][0], y[0][1]) -warnings.filterwarnings('ignore', message="Out of order field selection on recarrays") def test_find_duplicate(): l1 = [1, 2, 3, 4, 5, 6] |