Permalink
Browse files

Merge branch 'i617'

  • Loading branch information...
2 parents 902e67f + 28202e8 commit ff5e7cd7aececbe596d8a60cc083dff44c0b0666 @takluyver takluyver committed Jul 22, 2011
Showing with 7 additions and 1 deletion.
  1. +1 −0 IPython/core/history.py
  2. +6 −1 IPython/zmq/zmqshell.py
View
@@ -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)
View
@@ -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
@@ -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)
+
exiter = Instance(ZMQExitAutocall)
def _exiter_default(self):
return ZMQExitAutocall(self)

0 comments on commit ff5e7cd

Please sign in to comment.