diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2012-12-28 12:05:15 -0800 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2012-12-28 12:05:15 -0800 |
| commit | 4a3c3478ececa99d0382ca9a8d9d134d4bdd256d (patch) | |
| tree | d8036ffddeaae619d90578009a82f6a0add39c49 | |
| parent | 6b788c890be45f527cb7cf938279014053a36185 (diff) | |
| parent | 678ad43878dfae3a85362c549a8a5ab6bf5c48f1 (diff) | |
| download | numpy-4a3c3478ececa99d0382ca9a8d9d134d4bdd256d.tar.gz | |
Merge pull request #2863 from njsmith/remove-weird-type-check
FIX: remove a spurious check in get_cast_transfer_function
| -rw-r--r-- | numpy/core/src/multiarray/dtype_transfer.c | 8 | ||||
| -rw-r--r-- | numpy/core/tests/test_dtype.py | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/numpy/core/src/multiarray/dtype_transfer.c b/numpy/core/src/multiarray/dtype_transfer.c index 55027e3fa..e964bc265 100644 --- a/numpy/core/src/multiarray/dtype_transfer.c +++ b/numpy/core/src/multiarray/dtype_transfer.c @@ -1475,14 +1475,6 @@ get_cast_transfer_function(int aligned, npy_intp src_itemsize = src_dtype->elsize, dst_itemsize = dst_dtype->elsize; - if (src_dtype->type_num == dst_dtype->type_num && - src_dtype->type_num != NPY_DATETIME && - src_dtype->type_num != NPY_TIMEDELTA) { - PyErr_SetString(PyExc_ValueError, - "low level cast function is for unequal type numbers"); - return NPY_FAIL; - } - if (get_nbo_cast_transfer_function(aligned, src_stride, dst_stride, src_dtype, dst_dtype, diff --git a/numpy/core/tests/test_dtype.py b/numpy/core/tests/test_dtype.py index 92e335165..f0b0cdc06 100644 --- a/numpy/core/tests/test_dtype.py +++ b/numpy/core/tests/test_dtype.py @@ -443,6 +443,9 @@ class TestString(TestCase): # Pull request #376 dt = np.dtype('(1L,)i4') + def test_base_dtype_with_object_type(self): + # Issue gh-2798 + a = np.array(['a'], dtype="O").astype(("O", [("name", "O")])) class TestDtypeAttributeDeletion(object): |