diff options
Diffstat (limited to 'python/helpers/pydev/pydev_ipython_console.py')
| -rw-r--r-- | python/helpers/pydev/pydev_ipython_console.py | 62 |
1 files changed, 5 insertions, 57 deletions
diff --git a/python/helpers/pydev/pydev_ipython_console.py b/python/helpers/pydev/pydev_ipython_console.py index 859157e022ad..0c51dfe3ed44 100644 --- a/python/helpers/pydev/pydev_ipython_console.py +++ b/python/helpers/pydev/pydev_ipython_console.py @@ -1,20 +1,15 @@ import sys from pydev_console_utils import BaseInterpreterInterface -import re import os os.environ['TERM'] = 'emacs' #to use proper page_more() for paging -#Uncomment to force PyDev standard shell. -#raise ImportError() +# Uncomment to force PyDev standard shell. +# raise ImportError() -try: - #IPython 0.11 broke compatibility... - from pydev_ipython_console_011 import PyDevFrontEnd -except: - from pydev_ipython_console_010 import PyDevFrontEnd +from pydev_ipython_console_011 import PyDevFrontEnd #======================================================================================================================= # InterpreterInterface @@ -28,7 +23,7 @@ class InterpreterInterface(BaseInterpreterInterface): BaseInterpreterInterface.__init__(self, mainThread) self.client_port = client_port self.host = host - self.interpreter = PyDevFrontEnd() + self.interpreter = PyDevFrontEnd(host, client_port) self._input_error_printed = False self.notification_succeeded = False self.notification_tries = 0 @@ -57,58 +52,11 @@ class InterpreterInterface(BaseInterpreterInterface): def getCompletions(self, text, act_tok): - try: - ipython_completion = text.startswith('%') - if not ipython_completion: - s = re.search(r'\bcd\b', text) - if s is not None and s.start() == 0: - ipython_completion = True - - if text is None: - text = "" - - TYPE_LOCAL = '9' - _line, completions = self.interpreter.complete(text) - - ret = [] - append = ret.append - for completion in completions: - if completion.startswith('%'): - append((completion[1:], '', '%', TYPE_LOCAL)) - else: - append((completion, '', '', TYPE_LOCAL)) - - if ipython_completion: - return ret - - #Otherwise, use the default PyDev completer (to get nice icons) - from _pydev_completer import Completer - - completer = Completer(self.getNamespace(), None) - completions = completer.complete(act_tok) - cset = set() - for c in completions: - cset.add(c[0]) - for c in ret: - if c[0] not in cset: - completions.append(c) - - return completions - - except: - import traceback - - traceback.print_exc() - return [] + return self.interpreter.getCompletions(text, act_tok) def close(self): sys.exit(0) - def ipython_editor(self, file, line): - server = self.get_server() - - if server is not None: - return server.IPythonEditor(os.path.realpath(file), line) def notify_about_magic(self): if not self.notification_succeeded: |