##// END OF EJS Templates
Merge pull request #1889 from invisibleroads/patch-3...
Merge pull request #1889 from invisibleroads/patch-3 Reconnect when the websocket connection closes unexpectedly. Closes #1577.

File last commit:

r4872:34c10438
r7405:41f79e73 merge
Show More
ipshell_nonblocking.py
518 lines | 16.4 KiB | text/x-python | PythonLexer
/ IPython / deathrow / gui / wx / ipshell_nonblocking.py
Ville M. Vainio
merge, fix crlf
r1112 #!/usr/bin/python
# -*- coding: iso-8859-15 -*-
'''
Provides IPython remote instance.
@author: Laurent Dufrechou
laurent.dufrechou _at_ gmail.com
@license: BSD
All rights reserved. This program and the accompanying materials are made
available under the terms of the BSD which accompanies this distribution, and
is available at U{http://www.opensource.org/licenses/bsd-license.php}
'''
__version__ = 0.9
__author__ = "Laurent Dufrechou"
__email__ = "laurent.dufrechou _at_ gmail.com"
__license__ = "BSD"
import re
import sys
import os
import locale
from thread_ex import ThreadEx
Brian Granger
More work addressing review comments for Fernando's branch....
r2499 from IPython.core import iplib
Brian Granger
Changing how IPython.utils.io.Term is handled....
r2775 import IPython.utils.io
Ville M. Vainio
merge, fix crlf
r1112
##############################################################################
class _Helper(object):
"""Redefine the built-in 'help'.
This is a wrapper around pydoc.help (with a twist).
"""
Laurent Dufréchou
cleanup and linted a bit :)
r1221 def __init__(self, pager):
Ville M. Vainio
merge, fix crlf
r1112 self._pager = pager
def __repr__(self):
return "Type help() for interactive help, " \
"or help(object) for help about object."
Bernardo B. Marques
remove all trailling spaces
r4872
Ville M. Vainio
merge, fix crlf
r1112 def __call__(self, *args, **kwds):
class DummyWriter(object):
Bernardo B. Marques
remove all trailling spaces
r4872 '''Dumy class to handle help output'''
Laurent Dufréchou
cleanup and linted a bit :)
r1221 def __init__(self, pager):
Ville M. Vainio
merge, fix crlf
r1112 self._pager = pager
Bernardo B. Marques
remove all trailling spaces
r4872
Laurent Dufréchou
cleanup and linted a bit :)
r1221 def write(self, data):
'''hook to fill self._pager'''
Ville M. Vainio
merge, fix crlf
r1112 self._pager(data)
import pydoc
pydoc.help.output = DummyWriter(self._pager)
pydoc.help.interact = lambda :1
Bernardo B. Marques
remove all trailling spaces
r4872
Ville M. Vainio
merge, fix crlf
r1112 return pydoc.help(*args, **kwds)
Bernardo B. Marques
remove all trailling spaces
r4872
Ville M. Vainio
merge, fix crlf
r1112 ##############################################################################
class _CodeExecutor(ThreadEx):
Laurent Dufréchou
cleanup and linted a bit :)
r1221 ''' Thread that execute ipython code '''
ldufrechou
Added an option to enable/disable threading as suggested by Ville.
r1621 def __init__(self, instance):
Ville M. Vainio
merge, fix crlf
r1112 ThreadEx.__init__(self)
self.instance = instance
Bernardo B. Marques
remove all trailling spaces
r4872
Ville M. Vainio
merge, fix crlf
r1112 def run(self):
Laurent Dufréchou
cleanup and linted a bit :)
r1221 '''Thread main loop'''
Ville M. Vainio
merge, fix crlf
r1112 try:
self.instance._doc_text = None
self.instance._help_text = None
self.instance._execute()
# used for uper class to generate event after execution
Bernardo B. Marques
remove all trailling spaces
r4872 self.instance._after_execute()
Ville M. Vainio
merge, fix crlf
r1112 except KeyboardInterrupt:
pass
Bernardo B. Marques
remove all trailling spaces
r4872
Ville M. Vainio
merge, fix crlf
r1112
##############################################################################
class NonBlockingIPShell(object):
'''
Create an IPython instance, running the commands in a separate,
Bernardo B. Marques
remove all trailling spaces
r4872 non-blocking thread.
Ville M. Vainio
merge, fix crlf
r1112 This allows embedding in any GUI without blockage.
Note: The ThreadEx class supports asynchroneous function call
via raise_exc()
'''
Brian Granger
More work addressing review comments for Fernando's branch....
r2499 def __init__(self, user_ns={}, user_global_ns=None,
Ville M. Vainio
merge, fix crlf
r1112 cin=None, cout=None, cerr=None,
ldufrechou
-revised code to correct ehaviour under linux....
r1153 ask_exit_handler=None):
Ville M. Vainio
merge, fix crlf
r1112 '''
@param user_ns: User namespace.
@type user_ns: dictionary
@param user_global_ns: User global namespace.
@type user_global_ns: dictionary.
@param cin: Console standard input.
@type cin: IO stream
@param cout: Console standard output.
@type cout: IO stream
@param cerr: Console standard error.
@type cerr: IO stream
@param exit_handler: Replacement for builtin exit() function
@type exit_handler: function
@param time_loop: Define the sleep time between two thread's loop
@type int
'''
#ipython0 initialisation
Laurent Dufréchou
cleanup and linted a bit :)
r1221 self._IP = None
Brian Granger
More work addressing review comments for Fernando's branch....
r2499 self.init_ipython0(user_ns, user_global_ns,
cin, cout, cerr,
ask_exit_handler)
Bernardo B. Marques
remove all trailling spaces
r4872
Ville M. Vainio
merge, fix crlf
r1112 #vars used by _execute
self._iter_more = 0
self._history_level = 0
ldufrechou
[/gui/wx] small patch to improve completion 'a=b.' now works
r1177 self._complete_sep = re.compile('[\s\{\}\[\]\(\)\=]')
Ville M. Vainio
merge, fix crlf
r1112 self._prompt = str(self._IP.outputcache.prompt1).strip()
#thread working vars
self._line_to_execute = ''
ldufrechou
Added an option to enable/disable threading as suggested by Ville.
r1621 self._threading = True
Bernardo B. Marques
remove all trailling spaces
r4872
Ville M. Vainio
merge, fix crlf
r1112 #vars that will be checked by GUI loop to handle thread states...
#will be replaced later by PostEvent GUI funtions...
self._doc_text = None
self._help_text = None
self._add_button = None
Brian Granger
More work addressing review comments for Fernando's branch....
r2499 def init_ipython0(self, user_ns={}, user_global_ns=None,
Ville M. Vainio
merge, fix crlf
r1112 cin=None, cout=None, cerr=None,
ldufrechou
-revised code to correct ehaviour under linux....
r1153 ask_exit_handler=None):
ldufrechou
Added an option to enable/disable threading as suggested by Ville.
r1621 ''' Initialize an ipython0 instance '''
Bernardo B. Marques
remove all trailling spaces
r4872
ldufrechou
New feature: Added Gael ipython1 synchroneous shell for quick comparison and improvement....
r1623 #first we redefine in/out/error functions of IPython
#BUG: we've got a limitation form ipython0 there
#only one instance can be instanciated else tehre will be
#cin/cout/cerr clash...
Ville M. Vainio
merge, fix crlf
r1112 if cin:
Brian Granger
Work to address the review comments on Fernando's branch....
r2498 Term.cin = cin
Ville M. Vainio
merge, fix crlf
r1112 if cout:
Brian Granger
Work to address the review comments on Fernando's branch....
r2498 Term.cout = cout
Ville M. Vainio
merge, fix crlf
r1112 if cerr:
Brian Granger
Work to address the review comments on Fernando's branch....
r2498 Term.cerr = cerr
Bernardo B. Marques
remove all trailling spaces
r4872
Ville M. Vainio
merge, fix crlf
r1112 excepthook = sys.excepthook
ldufrechou
New feature: Added Gael ipython1 synchroneous shell for quick comparison and improvement....
r1623
ldufrechou
Corrected a bug with control break, since last update....
r1587 #Hack to save sys.displayhook, because ipython seems to overwrite it...
self.sys_displayhook_ori = sys.displayhook
Brian Granger
More work addressing review comments for Fernando's branch....
r2499 ipython0 = iplib.InteractiveShell(
parent=None, config=None,
user_ns=user_ns,
user_global_ns=user_global_ns
)
self._IP = ipython0
Ville M. Vainio
merge, fix crlf
r1112
ldufrechou
New feature: Added Gael ipython1 synchroneous shell for quick comparison and improvement....
r1623 #we save ipython0 displayhook and we restore sys.displayhook
self.displayhook = sys.displayhook
ldufrechou
Corrected a bug with control break, since last update....
r1587 sys.displayhook = self.sys_displayhook_ori
Ville M. Vainio
merge, fix crlf
r1112 #we replace IPython default encoding by wx locale encoding
loc = locale.getpreferredencoding()
if loc:
Laurent Dufréchou
cleanup and linted a bit :)
r1221 self._IP.stdin_encoding = loc
Ville M. Vainio
merge, fix crlf
r1112 #we replace the ipython default pager by our pager
Laurent Dufréchou
cleanup and linted a bit :)
r1221 self._IP.set_hook('show_in_pager', self._pager)
Bernardo B. Marques
remove all trailling spaces
r4872
#we replace the ipython default shell command caller
laurent.dufrechou@gmail.com
some more little cleanup and a bug correction with prompt that comes with last commit
r1817 #by our shell handler
Laurent Dufréchou
cleanup and linted a bit :)
r1221 self._IP.set_hook('shell_hook', self._shell)
Bernardo B. Marques
remove all trailling spaces
r4872
Ville M. Vainio
merge, fix crlf
r1112 #we replace the ipython default input command caller by our method
Brian Granger
iplib.py => core/iplib.py and updated tests and imports.
r2028 iplib.raw_input_original = self._raw_input_original
Ville M. Vainio
merge, fix crlf
r1112 #we replace the ipython default exit command by our method
self._IP.exit = ask_exit_handler
#we replace the help command
self._IP.user_ns['help'] = _Helper(self._pager_help)
ldufrechou
-revised code to correct ehaviour under linux....
r1153
Brian Granger
More work addressing review comments for Fernando's branch....
r2499 #we disable cpaste magic... until we found a way to use it properly.
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def bypass_magic(self, arg):
ldufrechou
-revised code to correct ehaviour under linux....
r1153 print '%this magic is currently disabled.'
Brian Granger
More work addressing review comments for Fernando's branch....
r2499 ipython0.define_magic('cpaste', bypass_magic)
laurent dufrechou
Added a workaround for %reset magic as it is using raw_input via ask_yes_no.
r1808
laurent.dufrechou@gmail.com
cleaner way to handle raw_input, done with a TextEntryDialog + __builtin__ overload as suggested by Ville....
r1818 import __builtin__
__builtin__.raw_input = self._raw_input
Bernardo B. Marques
remove all trailling spaces
r4872
Ville M. Vainio
merge, fix crlf
r1112 sys.excepthook = excepthook
Bernardo B. Marques
remove all trailling spaces
r4872 #----------------------- Thread management section ----------------------
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def do_execute(self, line):
Ville M. Vainio
merge, fix crlf
r1112 """
Tell the thread to process the 'line' command
"""
self._line_to_execute = line
ldufrechou
New feature: Added Gael ipython1 synchroneous shell for quick comparison and improvement....
r1623
ldufrechou
Added an option to enable/disable threading as suggested by Ville.
r1621 if self._threading:
Bernardo B. Marques
remove all trailling spaces
r4872 #we launch the ipython line execution in a thread to make it
#interruptible with include it in self namespace to be able
laurent.dufrechou@gmail.com
some more little cleanup and a bug correction with prompt that comes with last commit
r1817 #to call ce.raise_exc(KeyboardInterrupt)
ldufrechou
Added an option to enable/disable threading as suggested by Ville.
r1621 self.ce = _CodeExecutor(self)
self.ce.start()
else:
try:
self._doc_text = None
self._help_text = None
self._execute()
# used for uper class to generate event after execution
Bernardo B. Marques
remove all trailling spaces
r4872 self._after_execute()
ldufrechou
Added an option to enable/disable threading as suggested by Ville.
r1621 except KeyboardInterrupt:
pass
ldufrechou
New feature: Added Gael ipython1 synchroneous shell for quick comparison and improvement....
r1623
laurent.dufrechou@gmail.com
some more little cleanup and a bug correction with prompt that comes with last commit
r1817 #----------------------- IPython management section ----------------------
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def get_threading(self):
ldufrechou
Added an option to enable/disable threading as suggested by Ville.
r1621 """
Returns threading status, is set to True, then each command sent to
the interpreter will be executed in a separated thread allowing,
for example, breaking a long running commands.
Disallowing it, permits better compatibilty with instance that is embedding
IPython instance.
@return: Execution method
@rtype: bool
"""
return self._threading
Bernardo B. Marques
remove all trailling spaces
r4872
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def set_threading(self, state):
ldufrechou
Added an option to enable/disable threading as suggested by Ville.
r1621 """
Sets threading state, if set to True, then each command sent to
the interpreter will be executed in a separated thread allowing,
for example, breaking a long running commands.
Disallowing it, permits better compatibilty with instance that is embedding
IPython instance.
@param state: Sets threading state
@type bool
"""
self._threading = state
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def get_doc_text(self):
Ville M. Vainio
merge, fix crlf
r1112 """
Returns the output of the processing that need to be paged (if any)
@return: The std output string.
@rtype: string
"""
return self._doc_text
Bernardo B. Marques
remove all trailling spaces
r4872
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def get_help_text(self):
Ville M. Vainio
merge, fix crlf
r1112 """
Returns the output of the processing that need to be paged via help pager(if any)
@return: The std output string.
@rtype: string
"""
return self._help_text
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def get_banner(self):
Ville M. Vainio
merge, fix crlf
r1112 """
Returns the IPython banner for useful info on IPython instance
@return: The banner string.
@rtype: string
"""
Fernando Perez
Minimal fixes so ipython-wx runs....
r2401 return self._IP.banner
Bernardo B. Marques
remove all trailling spaces
r4872
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def get_prompt_count(self):
Ville M. Vainio
merge, fix crlf
r1112 """
Returns the prompt number.
Each time a user execute a line in the IPython shell the prompt count is increased
@return: The prompt number
@rtype: int
"""
return self._IP.outputcache.prompt_count
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def get_prompt(self):
Ville M. Vainio
merge, fix crlf
r1112 """
Returns current prompt inside IPython instance
(Can be In [...]: ot ...:)
@return: The current prompt.
@rtype: string
"""
return self._prompt
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def get_indentation(self):
Ville M. Vainio
merge, fix crlf
r1112 """
Returns the current indentation level
Usefull to put the caret at the good start position if we want to do autoindentation.
@return: The indentation level.
@rtype: int
"""
return self._IP.indent_current_nsp
Bernardo B. Marques
remove all trailling spaces
r4872
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def update_namespace(self, ns_dict):
Ville M. Vainio
merge, fix crlf
r1112 '''
Add the current dictionary to the shell namespace.
@param ns_dict: A dictionary of symbol-values.
@type ns_dict: dictionary
'''
self._IP.user_ns.update(ns_dict)
def complete(self, line):
'''
Returns an auto completed line and/or posibilities for completion.
@param line: Given line so far.
@type line: string
@return: Line completed as for as possible,
and possible further completions.
@rtype: tuple
'''
split_line = self._complete_sep.split(line)
possibilities = self._IP.complete(split_line[-1])
if possibilities:
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def _common_prefix(str1, str2):
Ville M. Vainio
merge, fix crlf
r1112 '''
Reduction function. returns common prefix of two given strings.
@param str1: First string.
@type str1: string
@param str2: Second string
@type str2: string
@return: Common prefix to both strings.
@rtype: string
'''
for i in range(len(str1)):
if not str2.startswith(str1[:i+1]):
return str1[:i]
return str1
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 common_prefix = reduce(_common_prefix, possibilities)
Ville M. Vainio
merge, fix crlf
r1112 completed = line[:-len(split_line[-1])]+common_prefix
else:
completed = line
return completed, possibilities
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def history_back(self):
Ville M. Vainio
merge, fix crlf
r1112 '''
Provides one history command back.
@return: The command string.
@rtype: string
'''
history = ''
#the below while loop is used to suppress empty history lines
while((history == '' or history == '\n') and self._history_level >0):
Laurent Dufréchou
cleanup and linted a bit :)
r1221 if self._history_level >= 1:
self._history_level -= 1
Bernardo B. Marques
remove all trailling spaces
r4872 history = self._get_history()
Ville M. Vainio
merge, fix crlf
r1112 return history
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def history_forward(self):
Ville M. Vainio
merge, fix crlf
r1112 '''
Provides one history command forward.
@return: The command string.
@rtype: string
'''
history = ''
#the below while loop is used to suppress empty history lines
Laurent Dufréchou
cleanup and linted a bit :)
r1221 while((history == '' or history == '\n') \
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 and self._history_level <= self._get_history_max_index()):
if self._history_level < self._get_history_max_index():
Laurent Dufréchou
cleanup and linted a bit :)
r1221 self._history_level += 1
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 history = self._get_history()
Laurent Dufréchou
cleanup and linted a bit :)
r1221 else:
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 if self._history_level == self._get_history_max_index():
history = self._get_history()
Laurent Dufréchou
cleanup and linted a bit :)
r1221 self._history_level += 1
Ville M. Vainio
merge, fix crlf
r1112 else:
Laurent Dufréchou
cleanup and linted a bit :)
r1221 history = ''
Ville M. Vainio
merge, fix crlf
r1112 return history
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def init_history_index(self):
Ville M. Vainio
merge, fix crlf
r1112 '''
set history to last command entered
'''
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 self._history_level = self._get_history_max_index()+1
Ville M. Vainio
merge, fix crlf
r1112
#----------------------- IPython PRIVATE management section --------------
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def _after_execute(self):
Ville M. Vainio
merge, fix crlf
r1112 '''
Can be redefined to generate post event after excution is done
'''
pass
laurent.dufrechou@gmail.com
cleaner way to handle raw_input, done with a TextEntryDialog + __builtin__ overload as suggested by Ville....
r1818 def _ask_exit(self):
'''
Can be redefined to generate post event to exit the Ipython shell
'''
pass
ldufrechou
-revised code to correct ehaviour under linux....
r1153
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def _get_history_max_index(self):
Ville M. Vainio
merge, fix crlf
r1112 '''
returns the max length of the history buffer
@return: history length
@rtype: int
'''
return len(self._IP.input_hist_raw)-1
Bernardo B. Marques
remove all trailling spaces
r4872
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 def _get_history(self):
Ville M. Vainio
merge, fix crlf
r1112 '''
Get's the command string of the current history level.
@return: Historic command stri
@rtype: string
'''
rv = self._IP.input_hist_raw[self._history_level].strip('\n')
return rv
Laurent Dufréchou
cleanup and linted a bit :)
r1221 def _pager_help(self, text):
Ville M. Vainio
merge, fix crlf
r1112 '''
This function is used as a callback replacment to IPython help pager function
Laurent Dufréchou
cleanup and linted a bit :)
r1221 It puts the 'text' value inside the self._help_text string that can be retrived via
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 get_help_text function.
Ville M. Vainio
merge, fix crlf
r1112 '''
if self._help_text == None:
self._help_text = text
else:
self._help_text += text
Bernardo B. Marques
remove all trailling spaces
r4872
Laurent Dufréchou
cleanup and linted a bit :)
r1221 def _pager(self, IP, text):
Ville M. Vainio
merge, fix crlf
r1112 '''
This function is used as a callback replacment to IPython pager function
Laurent Dufréchou
cleanup and linted a bit :)
r1221 It puts the 'text' value inside the self._doc_text string that can be retrived via
laurent.dufrechou@gmail.com
Code refactoring to be pep8 complaint with functions names.
r1816 get_doc_text function.
Ville M. Vainio
merge, fix crlf
r1112 '''
self._doc_text = text
Bernardo B. Marques
remove all trailling spaces
r4872
laurent.dufrechou@gmail.com
cleaner way to handle raw_input, done with a TextEntryDialog + __builtin__ overload as suggested by Ville....
r1818 def _raw_input_original(self, prompt=''):
ldufrechou
-revised code to correct ehaviour under linux....
r1153 '''
Custom raw_input() replacement. Get's current line from console buffer.
@param prompt: Prompt to print. Here for compatability as replacement.
@type prompt: string
@return: The current command line text.
@rtype: string
'''
return self._line_to_execute
laurent.dufrechou@gmail.com
cleaner way to handle raw_input, done with a TextEntryDialog + __builtin__ overload as suggested by Ville....
r1818 def _raw_input(self, prompt=''):
""" A replacement from python's raw_input.
"""
raise NotImplementedError
Bernardo B. Marques
remove all trailling spaces
r4872
Ville M. Vainio
merge, fix crlf
r1112 def _execute(self):
'''
Executes the current line provided by the shell object.
'''
ldufrechou
New feature: Added Gael ipython1 synchroneous shell for quick comparison and improvement....
r1623
Ville M. Vainio
merge, fix crlf
r1112 orig_stdout = sys.stdout
Brian Granger
Work to address the review comments on Fernando's branch....
r2498 sys.stdout = Term.cout
ldufrechou
New feature: Added Gael ipython1 synchroneous shell for quick comparison and improvement....
r1623 #self.sys_displayhook_ori = sys.displayhook
#sys.displayhook = self.displayhook
Bernardo B. Marques
remove all trailling spaces
r4872
Ville M. Vainio
merge, fix crlf
r1112 try:
line = self._IP.raw_input(None, self._iter_more)
if self._IP.autoindent:
self._IP.readline_startup_hook(None)
except KeyboardInterrupt:
self._IP.write('\nKeyboardInterrupt\n')
self._IP.resetbuffer()
# keep cache in sync with the prompt counter:
self._IP.outputcache.prompt_count -= 1
if self._IP.autoindent:
self._IP.indent_current_nsp = 0
self._iter_more = 0
except:
self._IP.showtraceback()
else:
laurent dufrechou
Fix: output prompt is now displayed correclty.
r1813 self._IP.write(str(self._IP.outputcache.prompt_out).strip())
Brian Granger
Continuing a massive refactor of everything.
r2205 self._iter_more = self._IP.push_line(line)
laurent.dufrechou@gmail.com
some more little cleanup and a bug correction with prompt that comes with last commit
r1817 if (self._IP.SyntaxTB.last_syntax_error and \
Brian Granger
Massive, crazy refactoring of everything....
r2202 self._IP.autoedit_syntax):
Ville M. Vainio
merge, fix crlf
r1112 self._IP.edit_syntax_error()
if self._iter_more:
self._prompt = str(self._IP.outputcache.prompt2).strip()
if self._IP.autoindent:
self._IP.readline_startup_hook(self._IP.pre_readline)
else:
self._prompt = str(self._IP.outputcache.prompt1).strip()
self._IP.indent_current_nsp = 0 #we set indentation to 0
ldufrechou
New feature: Added Gael ipython1 synchroneous shell for quick comparison and improvement....
r1623
Ville M. Vainio
merge, fix crlf
r1112 sys.stdout = orig_stdout
ldufrechou
New feature: Added Gael ipython1 synchroneous shell for quick comparison and improvement....
r1623 #sys.displayhook = self.sys_displayhook_ori
Bernardo B. Marques
remove all trailling spaces
r4872
Ville M. Vainio
merge, fix crlf
r1112 def _shell(self, ip, cmd):
'''
Replacement method to allow shell commands without them blocking.
@param ip: Ipython instance, same as self._IP
@type cmd: Ipython instance
@param cmd: Shell command to execute.
@type cmd: string
'''
stdin, stdout = os.popen4(cmd)
laurent.dufrechou@gmail.com
some more little cleanup and a bug correction with prompt that comes with last commit
r1817 result = stdout.read().decode('cp437').\
encode(locale.getpreferredencoding())
Laurent Dufréchou
cleanup and linted a bit :)
r1221 #we use print command because the shell command is called
#inside IPython instance and thus is redirected to thread cout
Ville M. Vainio
merge, fix crlf
r1112 #"\x01\x1b[1;36m\x02" <-- add colour to the text...
print "\x01\x1b[1;36m\x02"+result
stdout.close()
stdin.close()