From 4fd046feaffb3edf85775711e9e17a47bcd25945 2014-04-03 23:38:00 From: jon Date: 2014-04-03 23:38:00 Subject: [PATCH] Don't send \r characters in zmqshell clear_ourput --- diff --git a/IPython/html/static/notebook/js/outputarea.js b/IPython/html/static/notebook/js/outputarea.js index ef642f0..e8e193d 100644 --- a/IPython/html/static/notebook/js/outputarea.js +++ b/IPython/html/static/notebook/js/outputarea.js @@ -274,9 +274,6 @@ var IPython = (function (IPython) { // validate output data types json = this.validate_output(json); - // TODO: Why are we recieving these new line characters for no - // reason? They ruin everything. - if (json.output_type === 'stream' && !json.text.trim()) return; // Clear the output if clear is queued. var needs_height_reset = false; diff --git a/IPython/kernel/zmq/zmqshell.py b/IPython/kernel/zmq/zmqshell.py index c2d044b..357b6e1 100644 --- a/IPython/kernel/zmq/zmqshell.py +++ b/IPython/kernel/zmq/zmqshell.py @@ -90,11 +90,7 @@ class ZMQDisplayPublisher(DisplayPublisher): def clear_output(self, wait=False): content = dict(wait=wait) - - print('\r', file=sys.stdout, end='') - print('\r', file=sys.stderr, end='') self._flush_streams() - self.session.send( self.pub_socket, u'clear_output', content, parent=self.parent_header, ident=self.topic,