From 1ec19a2ad12b717ce808a11d45388cfdb01f57e3 2015-01-02 10:29:09 From: mbyt Date: 2015-01-02 10:29:09 Subject: [PATCH] Allow completion on the numpy struct itself --- diff --git a/IPython/core/completer.py b/IPython/core/completer.py index c0c0c39..d58c2bf 100644 --- a/IPython/core/completer.py +++ b/IPython/core/completer.py @@ -863,7 +863,8 @@ class IPCompleter(Completer): return list(obj.keys()) except Exception: return [] - elif _safe_isinstance(obj, 'numpy', 'ndarray'): + elif _safe_isinstance(obj, 'numpy', 'ndarray') or\ + _safe_isinstance(obj, 'numpy', 'void'): return obj.dtype.names or [] return [] diff --git a/IPython/core/tests/test_completer.py b/IPython/core/tests/test_completer.py index f1a951a..9d8a037 100644 --- a/IPython/core/tests/test_completer.py +++ b/IPython/core/tests/test_completer.py @@ -668,6 +668,20 @@ def test_struct_array_key_completion(): _, matches = complete(line_buffer="d['") nt.assert_in("hello", matches) nt.assert_in("world", matches) + # complete on the numpy struct itself + dt = numpy.dtype([('my_head', [('my_dt', '>u4'), ('my_df', '>u4')]), + ('my_data', '>f4', 5)]) + x = numpy.zeros(2, dtype=dt) + ip.user_ns['d'] = x[1] + _, matches = complete(line_buffer="d['") + nt.assert_in("my_head", matches) + nt.assert_in("my_data", matches) + # complete on a nested level + with greedy_completion(): + ip.user_ns['d'] = numpy.zeros(2, dtype=dt) + _, matches = complete(line_buffer="d[1]['my_head']['") + nt.assert_true(any(["my_dt" in m for m in matches])) + nt.assert_true(any(["my_df" in m for m in matches])) @dec.skip_without('pandas')