[yade] 01/02: Fix ipython5 config module.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository yade.

commit a7a08a932117f0ae731525294375193a379087d0
Author: Anton Gladky <gladk at debian.org>
Date:   Sat Dec 10 21:15:23 2016 +0100

    Fix ipython5 config module.
---
 debian/patches/10_ipython5_fix.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/10_ipython5_fix.patch b/debian/patches/10_ipython5_fix.patch
new file mode 100644
index 0000000..b232f31
--- /dev/null
+++ b/debian/patches/10_ipython5_fix.patch
@@ -0,0 +1,24 @@
+Description: Fix ipython5 config module
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2016-12-10
+
+--- yade-2016.06a.orig/core/main/main.py.in
++++ yade-2016.06a/core/main/main.py.in
+@@ -228,9 +228,14 @@ def userSession(gui='none',qapp=None):
+ 			from IPython.terminal.embed import InteractiveShellEmbed
+ 		else:
+ 			from IPython.frontend.terminal.embed import InteractiveShellEmbed
+-		from IPython.config.loader import Config
+-		cfg = Config()
+-		prompt_config = cfg.PromptManager
++		if yade.runtime.ipython_version>=500:
++			from traitlets.config.loader import Config
++			cfg = Config()
++			prompt_config = cfg.TerminalInteractiveShell.prompts_class
++		else:
++			from IPython.config.loader import Config
++			cfg = Config()
++			prompt_config = cfg.PromptManager
+ 		prompt_config.in_template = ipconfig['prompt_in1']
+ 		prompt_config.in2_template = ipconfig['prompt_in2']
+ 		prompt_config.out_template = ipconfig['prompt_out']
diff --git a/debian/patches/series b/debian/patches/series
index 9bb316d..da006a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 06_fixCrash.patch
 07_ipython5.patch
 08_fix-FTBFS-bosst162.patch
+10_ipython5_fix.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yade.git