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.

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

I617 #618

Merged
merged 3 commits into from Jul 22, 2011
Merged

I617 #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b641eb6
Do not load readline when using the ZMQ shell.
takluyver Jul 21, 2011
3b27020
%history -g should show line numbers automatically.
takluyver Jul 21, 2011
28202e8
Comment explaining overriding readline_use traitlet.
takluyver Jul 22, 2011
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
1 change: 1 addition & 0 deletions IPython/core/history.py
View file
Open in desktop
Expand Up @@ -650,6 +650,7 @@ def _format_lineno(session, line):
if 'g' in opts: # Glob search
pattern = "*" + args + "*" if args else "*"
hist = history_manager.search(pattern, raw=raw, output=get_output)
print_nums = True
elif 'l' in opts: # Get 'tail'
try:
n = int(args)
Expand Down
7 changes: 6 additions & 1 deletion IPython/zmq/zmqshell.py
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@
from IPython.core.payloadpage import install_payload_page
from IPython.utils import io
from IPython.utils.path import get_py_filename
from IPython.utils.traitlets import Instance, Type, Dict
from IPython.utils.traitlets import Instance, Type, Dict, CBool
from IPython.utils.warn import warn
from IPython.zmq.displayhook import ZMQShellDisplayHook, _encode_png
from IPython.zmq.session import extract_header
Expand Down Expand Up @@ -80,6 +80,11 @@ class ZMQInteractiveShell(InteractiveShell):
displayhook_class = Type(ZMQShellDisplayHook)
display_pub_class = Type(ZMQDisplayPublisher)

# Override the traitlet in the parent class, because there's no point using
# readline for the kernel. Can be removed when the readline code is moved
# to the terminal frontend.
readline_use = CBool(False)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a short comment explaining that this is overriding a parent traitlet b/c in the zmq kernel there's no point in having readline.


exiter = Instance(ZMQExitAutocall)
def _exiter_default(self):
return ZMQExitAutocall(self)
Expand Down