From 8cbae5757b426a8d4bc85f8a3262bfc66f81e67e 2013-07-30 20:04:27
From: MinRK <benjaminrk@gmail.com>
Date: 2013-07-30 20:04:27
Subject: [PATCH] update payload source

should be simple key, not Python (or worse, IPython) specific long key.

I could have sworn I did this long ago,
but apparently the source key was only updated in display_data,
not execute_reply.
---

diff --git a/IPython/core/payloadpage.py b/IPython/core/payloadpage.py
index f8436b1..b1d07a6 100644
--- a/IPython/core/payloadpage.py
+++ b/IPython/core/payloadpage.py
@@ -82,7 +82,7 @@ def page(strng, start=0, screen_lines=0, pager_cmd=None,
             pass
         
     payload = dict(
-        source='IPython.kernel.zmq.page.page',
+        source='page',
         text=strng,
         html=html,
         start_line_number=start
diff --git a/IPython/html/static/services/kernels/js/kernel.js b/IPython/html/static/services/kernels/js/kernel.js
index 9d5806c..6f8ec7c 100644
--- a/IPython/html/static/services/kernels/js/kernel.js
+++ b/IPython/html/static/services/kernels/js/kernel.js
@@ -419,10 +419,10 @@ var IPython = (function (IPython) {
         // Payloads are handled by triggering events because we don't want the Kernel
         // to depend on the Notebook or Pager classes.
         for (var i=0; i<l; i++) {
-            if (payload[i].source === 'IPython.kernel.zmq.page.page') {
+            if (payload[i].source === 'page') {
                 var data = {'text':payload[i].text}
                 $([IPython.events]).trigger('open_with_text.Pager', data);
-            } else if (payload[i].source === 'IPython.kernel.zmq.zmqshell.ZMQInteractiveShell.set_next_input') {
+            } else if (payload[i].source === 'set_next_input') {
                 if (callbacks.set_next_input !== undefined) {
                     callbacks.set_next_input(payload[i].text)
                 }
diff --git a/IPython/kernel/zmq/zmqshell.py b/IPython/kernel/zmq/zmqshell.py
index 00a13e0..27d8113 100644
--- a/IPython/kernel/zmq/zmqshell.py
+++ b/IPython/kernel/zmq/zmqshell.py
@@ -172,7 +172,7 @@ class KernelMagics(Magics):
 
         # Send the payload back so that clients can modify their prompt display
         payload = dict(
-            source='IPython.kernel.zmq.zmqshell.ZMQInteractiveShell.doctest_mode',
+            source='doctest_mode',
             mode=dstore.mode)
         shell.payload_manager.write_payload(payload)
         
@@ -324,7 +324,7 @@ class KernelMagics(Magics):
         filename = os.path.abspath(filename)
 
         payload = {
-            'source' : 'IPython.kernel.zmq.zmqshell.ZMQInteractiveShell.edit_magic',
+            'source' : 'edit_magic',
             'filename' : filename,
             'line_number' : lineno
         }
@@ -536,7 +536,7 @@ class ZMQInteractiveShell(InteractiveShell):
         """
         new = self.prompt_manager.render('rewrite') + cmd
         payload = dict(
-            source='IPython.kernel.zmq.zmqshell.ZMQInteractiveShell.auto_rewrite_input',
+            source='auto_rewrite_input',
             transformed_input=new,
             )
         self.payload_manager.write_payload(payload)
@@ -545,7 +545,7 @@ class ZMQInteractiveShell(InteractiveShell):
         """Engage the exit actions."""
         self.exit_now = True
         payload = dict(
-            source='IPython.kernel.zmq.zmqshell.ZMQInteractiveShell.ask_exit',
+            source='ask_exit',
             exit=True,
             keepkernel=self.keepkernel_on_exit,
             )
@@ -583,7 +583,7 @@ class ZMQInteractiveShell(InteractiveShell):
         """Send the specified text to the frontend to be presented at the next
         input cell."""
         payload = dict(
-            source='IPython.kernel.zmq.zmqshell.ZMQInteractiveShell.set_next_input',
+            source='set_next_input',
             text=text
         )
         self.payload_manager.write_payload(payload)
diff --git a/IPython/qt/console/ipython_widget.py b/IPython/qt/console/ipython_widget.py
index a68ec0f..ca56588 100644
--- a/IPython/qt/console/ipython_widget.py
+++ b/IPython/qt/console/ipython_widget.py
@@ -105,10 +105,10 @@ class IPythonWidget(FrontendWidget):
 
     # IPythonWidget protected class variables.
     _PromptBlock = namedtuple('_PromptBlock', ['block', 'length', 'number'])
-    _payload_source_edit = zmq_shell_source + '.edit_magic'
-    _payload_source_exit = zmq_shell_source + '.ask_exit'
-    _payload_source_next_input = zmq_shell_source + '.set_next_input'
-    _payload_source_page = 'IPython.kernel.zmq.page.page'
+    _payload_source_edit = 'edit_magic'
+    _payload_source_exit = 'ask_exit'
+    _payload_source_next_input = 'set_next_input'
+    _payload_source_page = 'page'
     _retrying_history_request = False
 
     #---------------------------------------------------------------------------