##// END OF EJS Templates
Update sphinxext for new API...
Thomas Kluyver -
Show More
@@ -291,7 +291,9 b' class EmbeddedSphinxShell(object):'
291 self.IP = IP
291 self.IP = IP
292 self.user_ns = self.IP.user_ns
292 self.user_ns = self.IP.user_ns
293 self.user_global_ns = self.IP.user_global_ns
293 self.user_global_ns = self.IP.user_global_ns
294 self.input_transformer_mgr = self.IP.input_transformer_manager
294
295
296 self.lines_waiting = []
295 self.input = ''
297 self.input = ''
296 self.output = ''
298 self.output = ''
297 self.tmp_profile_dir = tmp_profile_dir
299 self.tmp_profile_dir = tmp_profile_dir
@@ -326,13 +328,12 b' class EmbeddedSphinxShell(object):'
326 """process the input, capturing stdout"""
328 """process the input, capturing stdout"""
327
329
328 stdout = sys.stdout
330 stdout = sys.stdout
329 splitter = self.IP.input_splitter
330 try:
331 try:
331 sys.stdout = self.cout
332 sys.stdout = self.cout
332 splitter.push(line)
333 self.lines_waiting.append(line)
333 more = splitter.push_accepts_more()
334 if self.input_transformer_mgr.check_complete()[0] != 'incomplete':
334 if not more:
335 source_raw = ''.join(self.lines_waiting)
335 source_raw = splitter.raw_reset()
336 self.lines_waiting = []
336 self.IP.run_cell(source_raw, store_history=store_history)
337 self.IP.run_cell(source_raw, store_history=store_history)
337 finally:
338 finally:
338 sys.stdout = stdout
339 sys.stdout = stdout
@@ -235,7 +235,7 b' class TerminalInteractiveShell(InteractiveShell):'
235 prompt_text = "".join(x[1] for x in self.prompts.in_prompt_tokens())
235 prompt_text = "".join(x[1] for x in self.prompts.in_prompt_tokens())
236 lines = [input(prompt_text)]
236 lines = [input(prompt_text)]
237 prompt_continuation = "".join(x[1] for x in self.prompts.continuation_prompt_tokens())
237 prompt_continuation = "".join(x[1] for x in self.prompts.continuation_prompt_tokens())
238 while not itm.check_complete('\n'.join(lines)):
238 while itm.check_complete('\n'.join(lines))[0] == 'incomplete':
239 lines.append( input(prompt_continuation) )
239 lines.append( input(prompt_continuation) )
240 return '\n'.join(lines)
240 return '\n'.join(lines)
241 self.prompt_for_code = prompt
241 self.prompt_for_code = prompt
General Comments 0
You need to be logged in to leave comments. Login now