Show More
@@ -1,11 +1,6 b'' | |||
|
1 | 1 | # -*- coding: utf-8 -*- |
|
2 | 2 | import readline |
|
3 | import time | |
|
4 | import sys | |
|
5 | stdout = sys.stdout | |
|
6 | ||
|
7 | class TimeoutError(Exception): | |
|
8 | pass | |
|
3 | from Queue import Empty | |
|
9 | 4 | |
|
10 | 5 | class ClientCompleter2p(object): |
|
11 | 6 | """Client-side completion machinery. |
@@ -27,22 +22,18 b' class ClientCompleter2p(object):' | |||
|
27 | 22 | dict(text=text, line=line)) |
|
28 | 23 | # send completion request to kernel |
|
29 | 24 | # Give the kernel up to 0.5s to respond |
|
30 | for i in range(5): | |
|
31 | if self.km.xreq_channel.was_called(): | |
|
32 | msg_xreq = self.km.xreq_channel.get_msg() | |
|
25 | msg_xreq = self.km.xreq_channel.get_msg(timeout=0.5) | |
|
33 | 26 |
|
|
34 | 27 |
|
|
35 | 28 |
|
|
36 | 29 |
|
|
37 | ||
|
38 | time.sleep(0.1) | |
|
39 | raise TimeoutError | |
|
30 | return [] | |
|
40 | 31 | |
|
41 | 32 | def complete(self, text, state): |
|
42 | 33 | if state == 0: |
|
43 | 34 | try: |
|
44 | 35 | self.matches = self.complete_request(text) |
|
45 |
except |
|
|
36 | except Empty: | |
|
46 | 37 | print('WARNING: Kernel timeout on tab completion.') |
|
47 | 38 | |
|
48 | 39 | try: |
@@ -17,32 +17,18 b' For more details, see the ipython-zmq design' | |||
|
17 | 17 | #----------------------------------------------------------------------------- |
|
18 | 18 | |
|
19 | 19 | import __builtin__ |
|
20 | from contextlib import nested | |
|
21 | import time | |
|
22 | 20 | import sys |
|
23 | 21 | import os |
|
24 | import signal | |
|
25 | import uuid | |
|
26 | import cPickle as pickle | |
|
27 | import code | |
|
28 | import zmq | |
|
22 | from Queue import Empty | |
|
29 | 23 | import readline |
|
30 | 24 | import rlcompleter |
|
31 | import time | |
|
32 | 25 | |
|
33 | 26 | #----------------------------------------------------------------------------- |
|
34 | 27 | # Imports from ipython |
|
35 | 28 | #----------------------------------------------------------------------------- |
|
36 | 29 | from IPython.external.argparse import ArgumentParser |
|
37 | from IPython.utils.traitlets import ( | |
|
38 | Int, Str, CBool, CaselessStrEnum, Enum, List, Unicode | |
|
39 | ) | |
|
40 | from IPython.core.interactiveshell import get_default_colors | |
|
41 | from IPython.core.excolors import exception_colors | |
|
42 | from IPython.utils import PyColorize | |
|
43 | 30 | from IPython.core.inputsplitter import IPythonInputSplitter |
|
44 |
from IPython. |
|
|
45 | from IPython.zmq.session import Session | |
|
31 | from IPython.zmq.blockingkernelmanager import BlockingKernelManager as KernelManager | |
|
46 | 32 | from IPython.frontend.zmqterminal.completer import ClientCompleter2p |
|
47 | 33 | |
|
48 | 34 | #----------------------------------------------------------------------------- |
@@ -134,13 +120,14 b' class Frontend(object):' | |||
|
134 | 120 | See parent class :meth:`execute` docstring for full details. |
|
135 | 121 | """ |
|
136 | 122 | self.km.xreq_channel.execute(source, hidden) |
|
123 | while not self.km.xreq_channel.msg_ready(): | |
|
124 | try: | |
|
125 | self.handle_rep_channel(timeout=0.1) | |
|
126 | except Empty: | |
|
127 | pass | |
|
137 | 128 | self.handle_xreq_channel() |
|
138 | self.handle_rep_channel() | |
|
139 | 129 | |
|
140 | 130 | def handle_xreq_channel(self): |
|
141 | # Give the kernel up to 0.5s to respond | |
|
142 | for i in range(5): | |
|
143 | if self.km.xreq_channel.was_called(): | |
|
144 | 131 |
|
|
145 | 132 |
|
|
146 | 133 |
|
@@ -151,11 +138,12 b' class Frontend(object):' | |||
|
151 | 138 |
|
|
152 | 139 |
|
|
153 | 140 |
|
|
141 | try: # These bits aren't there for a SyntaxError | |
|
154 | 142 |
|
|
155 | 143 |
|
|
144 | except IndexError: | |
|
145 | pass | |
|
156 | 146 |
|
|
157 | break | |
|
158 | time.sleep(0.1) | |
|
159 | 147 | |
|
160 | 148 | |
|
161 | 149 | def handle_sub_channel(self): |
@@ -168,7 +156,7 b' class Frontend(object):' | |||
|
168 | 156 | sub_msg: message receive from kernel in the sub socket channel |
|
169 | 157 | capture by kernel manager. |
|
170 | 158 | """ |
|
171 |
while self.km.sub_channel. |
|
|
159 | while self.km.sub_channel.msg_ready(): | |
|
172 | 160 | sub_msg = self.km.sub_channel.get_msg() |
|
173 | 161 | if self.msg_header["username"] == sub_msg['parent_header']['username'] and \ |
|
174 | 162 | self.km.session.session == sub_msg['parent_header']['session']: |
@@ -188,11 +176,10 b' class Frontend(object):' | |||
|
188 | 176 | print >> sys.stdout,"Out[%i]:"%sub_msg["content"]["execution_count"], sub_msg["content"]["data"]["text/plain"] |
|
189 | 177 | sys.stdout.flush() |
|
190 | 178 | |
|
191 | def handle_rep_channel(self): | |
|
179 | def handle_rep_channel(self, timeout=0.1): | |
|
192 | 180 | """ Method to capture raw_input |
|
193 | 181 | """ |
|
194 | if self.km.rep_channel.was_called() : | |
|
195 | self.msg_rep = self.km.rep_channel.get_msg() | |
|
182 | self.msg_rep = self.km.rep_channel.get_msg(timeout=timeout) | |
|
196 | 183 |
|
|
197 | 184 |
|
|
198 | 185 |
|
@@ -270,7 +257,6 b' def start_frontend():' | |||
|
270 | 257 | |
|
271 | 258 | |
|
272 | 259 | kernel_manager.start_channels() |
|
273 | time.sleep(4) | |
|
274 | 260 | |
|
275 | 261 | frontend=Frontend(kernel_manager) |
|
276 | 262 | return frontend |
@@ -16,6 +16,7 b' from __future__ import print_function' | |||
|
16 | 16 | |
|
17 | 17 | # Stdlib |
|
18 | 18 | from Queue import Queue, Empty |
|
19 | from threading import Event | |
|
19 | 20 | |
|
20 | 21 | # Our own |
|
21 | 22 | from IPython.utils import io |
@@ -104,9 +105,31 b' class BlockingShellSocketChannel(ShellSocketChannel):' | |||
|
104 | 105 | |
|
105 | 106 | class BlockingStdInSocketChannel(StdInSocketChannel): |
|
106 | 107 | |
|
108 | def __init__(self, context, session, address=None): | |
|
109 | super(BlockingRepSocketChannel, self).__init__(context, session, address) | |
|
110 | self._in_queue = Queue() | |
|
111 | ||
|
107 | 112 | def call_handlers(self, msg): |
|
108 | 113 | #io.rprint('[[Rep]]', msg) # dbg |
|
109 | pass | |
|
114 | self._in_queue.put(msg) | |
|
115 | ||
|
116 | def get_msg(self, block=True, timeout=None): | |
|
117 | "Gets a message if there is one that is ready." | |
|
118 | return self._in_queue.get(block, timeout) | |
|
119 | ||
|
120 | def get_msgs(self): | |
|
121 | """Get all messages that are currently ready.""" | |
|
122 | msgs = [] | |
|
123 | while True: | |
|
124 | try: | |
|
125 | msgs.append(self.get_msg(block=False)) | |
|
126 | except Empty: | |
|
127 | break | |
|
128 | return msgs | |
|
129 | ||
|
130 | def msg_ready(self): | |
|
131 | "Is there a message that has been received?" | |
|
132 | return not self._in_queue.empty() | |
|
110 | 133 | |
|
111 | 134 | |
|
112 | 135 | class BlockingHBSocketChannel(HBSocketChannel): |
|
1 | NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now