diff options
| author | Sebastian Berg <sebastian@sipsolutions.net> | 2021-01-11 15:39:03 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-11 15:39:03 -0600 |
| commit | d0f19a2d633b12119909b7c9205a8c8932ebbd51 (patch) | |
| tree | 2e7b43d85f24a16122578d7a2d4d71fc4a35b9cd /numpy | |
| parent | a190258d4e90f2a17a9469e5dd9fb5f4b045aa90 (diff) | |
| parent | aa6f5b76e60e7ba71b278e9c0125c35e5f8a92e7 (diff) | |
| download | numpy-d0f19a2d633b12119909b7c9205a8c8932ebbd51.tar.gz | |
Merge pull request #18136 from Iamsoto/add_keyboard_interrupts_for_array_creation
ENH: Adding keyboard interrupt support for array creation
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarray/array_coercion.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/numpy/core/src/multiarray/array_coercion.c b/numpy/core/src/multiarray/array_coercion.c index 1eac401bc..0fd958282 100644 --- a/numpy/core/src/multiarray/array_coercion.c +++ b/numpy/core/src/multiarray/array_coercion.c @@ -1098,6 +1098,11 @@ PyArray_DiscoverDTypeAndShape_Recursive( return curr_dims + 1; } + /* Allow keyboard interrupts. See gh issue 18117. */ + if (PyErr_CheckSignals() < 0) { + return -1; + } + /* Recursive call for each sequence item */ for (Py_ssize_t i = 0; i < size; i++) { max_dims = PyArray_DiscoverDTypeAndShape_Recursive( |