set_next_input: squash multiple calls from the same cell execution

pablooliveira · pablooliveira · commit 654c9fe583fe · 2013-10-08T23:07:11.000+02:00
* When calling multiple times set_next_input in a single cell execution, we only keep the last input. * Added generic support to PayloadManager for updating (instead of appending) payloads from a given 'source'. Closes #1349
diff --git a/IPython/core/payload.py b/IPython/core/payload.py
@@ -29,9 +29,17 @@ class PayloadManager(Configurable):
 
     _payload = List([])
 
-    def write_payload(self, data):
+    def write_payload(self, data, update=False):
         if not isinstance(data, dict):
             raise TypeError('Each payload write must be a dict, got: %r' % data)
+
+        if update and 'source' in data:
+            source = data['source']
+            for i,pl in enumerate(self._payload):
+                if 'source' in pl and pl['source'] == source:
+                    self._payload[i] = data
+                    return
+
         self._payload.append(data)
 
     def read_payload(self):
diff --git a/IPython/kernel/zmq/zmqshell.py b/IPython/kernel/zmq/zmqshell.py
@@ -583,7 +583,7 @@ def set_next_input(self, text):
             source='set_next_input',
             text=text
         )
-        self.payload_manager.write_payload(payload)
+        self.payload_manager.write_payload(payload, update=True)
     
     #-------------------------------------------------------------------------
     # Things related to magics

Original file line number	Diff line number	Diff line change
`@@ -583,7 +583,7 @@ def set_next_input(self, text):`
`583`	`583`	`source='set_next_input',`
`584`	`584`	`text=text`
`585`	`585`	`)`
`586`		`- self.payload_manager.write_payload(payload)`
	`586`	`+ self.payload_manager.write_payload(payload, update=True)`
`587`	`587`
`588`	`588`	`#-------------------------------------------------------------------------`
`589`	`589`	`# Things related to magics`