##// END OF EJS Templates
Merge pull request #1361 from ellisonbg/nbissues...
Merge pull request #1361 from ellisonbg/nbissues A number of bug fixes for notebook issues that had crept up recently with all the major improvements done on multiple fronts. In closing #1359, we've changed slightly how Math() works: it now unconditionally surrounds its input with $$...$$, so that it always appears in displayed math mode. We have also introduced a new display object, Latex(), which does *not* add any latex markup, for other constructs beyond simple math expressions. This change makes Math() friendlier to use in simple cases and means that Math(sympy.latex(foo)) will produce the expected displayed math results without the user having to add any $ markup. Summary of fixes: Fixes #1344: Ctrl + M + L does not toggle line numbering in htmlnotebook. Fixes #1337: Tab in the notebook after `(` should not indent, only give a tooltip. Fixes #1339: Notebook printing broken. Fixes #1348: `Ctrl-m-Ctrl-m` does not switch to markdown cell Fixes #1359: [sympyprinting] MathJax can't render \root{m}{n}

File last commit:

r5611:fd342639
r6066:54c3e061 merge
Show More
completer.py
44 lines | 1.4 KiB | text/x-python | PythonLexer
Omar Andres Zapata Mesa
-mworking in tab-completion
r5584 # -*- coding: utf-8 -*-
import readline
Thomas Kluyver
Refactor and simplification of zmqterminal.
r5596 from Queue import Empty
Thomas Kluyver
Minor tidy up of zmqterminal.completer
r5595
MinRK
zmqterminal subclasses TerminalInteractiveShell/IPApp...
r5600 class ZMQCompleter(object):
Omar Andres Zapata Mesa
-mworking in tab-completion
r5584 """Client-side completion machinery.
How it works: self.complete will be called multiple times, with
state=0,1,2,... When state=0 it should compute ALL the completion matches,
and then return them for each value of state."""
MinRK
zmqterminal subclasses TerminalInteractiveShell/IPApp...
r5600 def __init__(self, shell, km):
self.shell = shell
Omar Andres Zapata Mesa
-mworking in tab-completion
r5584 self.km = km
self.matches = []
def complete_request(self,text):
Omar Andres Zapata Mesa
tab completion is not working yet, unknow error
r5585 line = readline.get_line_buffer()
Thomas Kluyver
Simplify handling of messaging in zmqterminal.
r5597 cursor_pos = readline.get_endidx()
Omar Andres Zapata Mesa
tab completion is not working yet, unknow error
r5585 # send completion request to kernel
# Give the kernel up to 0.5s to respond
MinRK
zmqterminal subclasses TerminalInteractiveShell/IPApp...
r5600 msg_id = self.km.shell_channel.complete(text=text, line=line,
Thomas Kluyver
Simplify handling of messaging in zmqterminal.
r5597 cursor_pos=cursor_pos)
MinRK
zmqterminal subclasses TerminalInteractiveShell/IPApp...
r5600 msg = self.km.shell_channel.get_msg(timeout=0.5)
if msg['parent_header']['msg_id'] == msg_id:
return msg["content"]["matches"]
Thomas Kluyver
Refactor and simplification of zmqterminal.
r5596 return []
Omar Andres Zapata Mesa
-mworking in tab-completion
r5584
MinRK
zmqterminal subclasses TerminalInteractiveShell/IPApp...
r5600 def rlcomplete(self, text, state):
Thomas Kluyver
Minor tidy up of zmqterminal.completer
r5595 if state == 0:
try:
self.matches = self.complete_request(text)
Thomas Kluyver
Refactor and simplification of zmqterminal.
r5596 except Empty:
Thomas Kluyver
Minor tidy up of zmqterminal.completer
r5595 print('WARNING: Kernel timeout on tab completion.')
Thomas Kluyver
Replace tabs with spaces
r5591 try:
return self.matches[state]
except IndexError:
return None
MinRK
zmqterminal subclasses TerminalInteractiveShell/IPApp...
r5600
def complete(self, text, line, cursor_pos=None):
return self.rlcomplete(text, 0)