From 6a91fb65d06fc55fcab94dfd1158f7ccf7205f76 2014-05-07 05:41:24 From: MinRK Date: 2014-05-07 05:41:24 Subject: [PATCH] remove 'name' from inspect_reply --- diff --git a/IPython/kernel/inprocess/tests/test_kernelmanager.py b/IPython/kernel/inprocess/tests/test_kernelmanager.py index 629dd37..f44a651 100644 --- a/IPython/kernel/inprocess/tests/test_kernelmanager.py +++ b/IPython/kernel/inprocess/tests/test_kernelmanager.py @@ -81,7 +81,6 @@ class InProcessKernelManagerTestCase(unittest.TestCase): self.assertEqual(msg['header']['msg_type'], 'inspect_reply') content = msg['content'] assert content['found'] - self.assertEqual(content['name'], 'foo') text = content['data']['text/plain'] self.assertIn('int', text) diff --git a/IPython/kernel/tests/test_message_spec.py b/IPython/kernel/tests/test_message_spec.py index 9c9da71..0850a1d 100644 --- a/IPython/kernel/tests/test_message_spec.py +++ b/IPython/kernel/tests/test_message_spec.py @@ -121,7 +121,6 @@ class ExecuteReplyError(Reference): class InspectReply(MimeBundle): - name = Unicode() found = Bool() @@ -315,7 +314,6 @@ def test_oinfo_found(): validate_message(reply, 'inspect_reply', msg_id) content = reply['content'] assert content['found'] - nt.assert_equal(content['name'], 'a') text = content['data']['text/plain'] nt.assert_in('Type:', text) nt.assert_in('Docstring:', text) @@ -331,7 +329,6 @@ def test_oinfo_detail(): validate_message(reply, 'inspect_reply', msg_id) content = reply['content'] assert content['found'] - nt.assert_equal(content['name'], 'ip.object_inspect') text = content['data']['text/plain'] nt.assert_in('Definition:', text) nt.assert_in('Source:', text) @@ -388,7 +385,6 @@ def test_stream(): stdout = KC.iopub_channel.get_msg(timeout=TIMEOUT) validate_message(stdout, 'stream', msg_id) content = stdout['content'] - nt.assert_equal(content['name'], u'stdout') nt.assert_equal(content['data'], u'hi\n') diff --git a/IPython/kernel/zmq/ipkernel.py b/IPython/kernel/zmq/ipkernel.py index 5f20b23..6e23029 100755 --- a/IPython/kernel/zmq/ipkernel.py +++ b/IPython/kernel/zmq/ipkernel.py @@ -514,7 +514,6 @@ class Kernel(Configurable): reply_content = {'status' : 'ok'} reply_content['data'] = data = {} reply_content['metadata'] = {} - reply_content['name'] = name reply_content['found'] = info['found'] if info['found']: info_text = self.shell.object_inspect_text(