Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't log complete contents of history replies, even in debug #1362

Merged
merged 1 commit into from Feb 2, 2012
Merged

Don't log complete contents of history replies, even in debug #1362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion IPython/frontend/qt/console/ipython_widget.py
View file
Open in desktop
Expand Up @@ -179,7 +179,6 @@ def _handle_history_reply(self, msg):
""" Implemented to handle history tail replies, which are only supported
by the IPython kernel.
"""
self.log.debug("history: %s", msg.get('content', ''))
content = msg['content']
if 'history' not in content:
self.log.error("History request failed: %r"%content)
Expand All @@ -199,6 +198,7 @@ def _handle_history_reply(self, msg):
# reset retry flag
self._retrying_history_request = False
history_items = content['history']
self.log.debug("Received history reply with %i entries", len(history_items))
items = []
last_cell = u""
for _, _, cell in history_items:
Expand Down
5 changes: 3 additions & 2 deletions IPython/zmq/ipkernel.py
View file
Open in desktop
Expand Up @@ -391,11 +391,12 @@ def history_request(self, ident, parent):

else:
hist = []
content = {'history' : list(hist)}
hist = list(hist)
content = {'history' : hist}
content = json_clean(content)
msg = self.session.send(self.shell_socket, 'history_reply',
content, parent, ident)
self.log.debug(str(msg))
self.log.debug("Sending history reply with %i entries", len(hist))

def connect_request(self, ident, parent):
if self._recorded_ports is not None:
Expand Down