##// END OF EJS Templates
Code review changes....
Code review changes. Fixed handler issues and api tests from code review from @minrk and @carreau.

File last commit:

r11676:c32a3259
r13048:56ccf804
Show More
completer.py
52 lines | 1.7 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
Matthias BUSSONNIER
Add configurability to tabcompletion timeout...
r11676 from IPython.config import Configurable
from IPython.utils.traitlets import Float
class ZMQCompleter(Configurable):
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."""
Matthias BUSSONNIER
Add configurability to tabcompletion timeout...
r11676
timeout = Float(5.0, config=True, help='timeout before completion abort')
Omar Andres Zapata Mesa
-mworking in tab-completion
r5584
Matthias BUSSONNIER
Add configurability to tabcompletion timeout...
r11676 def __init__(self, shell, client, config=None):
super(ZMQCompleter,self).__init__(config=config)
MinRK
zmqterminal subclasses TerminalInteractiveShell/IPApp...
r5600 self.shell = shell
MinRK
update terminal console to new KM / KC APIs
r10287 self.client = client
Omar Andres Zapata Mesa
-mworking in tab-completion
r5584 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
update terminal console to new KM / KC APIs
r10287 msg_id = self.client.shell_channel.complete(text=text, line=line,
Thomas Kluyver
Simplify handling of messaging in zmqterminal.
r5597 cursor_pos=cursor_pos)
Matthias BUSSONNIER
Add configurability to tabcompletion timeout...
r11676 msg = self.client.shell_channel.get_msg(timeout=self.timeout)
MinRK
zmqterminal subclasses TerminalInteractiveShell/IPApp...
r5600 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:
Matthias BUSSONNIER
Add configurability to tabcompletion timeout...
r11676 #print('WARNING: Kernel timeout on tab completion.')
pass
Thomas Kluyver
Minor tidy up of zmqterminal.completer
r5595
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)