From 183a5b296a733529f1c5a929ea61ff69fae60eb9 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sun, 26 Oct 2014 16:37:11 +0100
Subject: [PATCH] [bluec0re] Make ipython_view compatible to version >= 1.0.
Fixes #7868
---
src/ipython_view.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/ipython_view.py b/src/ipython_view.py
index 089a5345b3..09c16a93b6 100644
--- a/src/ipython_view.py
+++ b/src/ipython_view.py
@@ -90,7 +90,10 @@ class IterableIPShell:
@type input_func: function
"""
if input_func:
- IPython.frontend.terminal.interactiveshell.raw_input_original = input_func
+ if IPython.version_info[0] >= 1:
+ IPython.terminal.interactiveshell.raw_input_original = input_func
+ else:
+ IPython.frontend.terminal.interactiveshell.raw_input_original = input_func
if cin:
IPython.utils.io.stdin = IPython.utils.io.IOStream(cin)
if cout:
@@ -110,7 +113,10 @@ class IterableIPShell:
cfg = Config()
cfg.InteractiveShell.colors = "Linux"
- self.IP = IPython.frontend.terminal.embed.InteractiveShellEmbed(config=cfg, user_ns=user_ns)
+ if IPython.version_info[0] >= 1:
+ self.IP = IPython.terminal.embed.InteractiveShellEmbed(config=cfg, user_ns=user_ns)
+ else:
+ self.IP = IPython.frontend.terminal.embed.InteractiveShellEmbed(config=cfg, user_ns=user_ns)
self.IP.system = lambda cmd: self.shell(self.IP.var_expand(cmd),
header='IPython system call: ',
local_ns=user_ns)
--
GitLab