r53730 - in /desktop/unstable/accerciser/debian: changelog patches/02_ipython5.patch patches/series

[sthibault at users.alioth.debian.org]

Author: sthibault
Date: Tue Sep 12 14:57:08 2017
New Revision: 53730

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53730
Log:
Add debian/patches/02_ipython5.patch to fix python console (Closes: #848119)

Added:
    desktop/unstable/accerciser/debian/patches/02_ipython5.patch
Modified:
    desktop/unstable/accerciser/debian/changelog
    desktop/unstable/accerciser/debian/patches/series

Modified: desktop/unstable/accerciser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/accerciser/debian/changelog?rev=53730&op=diff
==============================================================================
--- desktop/unstable/accerciser/debian/changelog	[utf-8] (original)
+++ desktop/unstable/accerciser/debian/changelog	[utf-8] Tue Sep 12 14:57:08 2017
@@ -1,3 +1,9 @@
+accerciser (3.22.0-3) UNRELEASED; urgency=medium
+
+  * Add debian/patches/02_ipython5.patch to fix python console (Closes: #848119)
+
+ -- Samuel Thibault <sthibault at debian.org>  Tue, 12 Sep 2017 16:54:50 +0200
+
 accerciser (3.22.0-2) unstable; urgency=medium
 
   * Add missing Depends on gir1.2-glib-2.0 and gir1.2-rsvg-2.0.

Added: desktop/unstable/accerciser/debian/patches/02_ipython5.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/accerciser/debian/patches/02_ipython5.patch?rev=53730&op=file
==============================================================================
--- desktop/unstable/accerciser/debian/patches/02_ipython5.patch	(added)
+++ desktop/unstable/accerciser/debian/patches/02_ipython5.patch	[utf-8] Tue Sep 12 14:57:08 2017
@@ -0,0 +1,33 @@
+diff --git a/plugins/ipython_view.py b/plugins/ipython_view.py
+index 04f2d53..ae3d2be 100755
+--- a/plugins/ipython_view.py
++++ b/plugins/ipython_view.py
+@@ -125,7 +125,8 @@ class IterableIPShell:
+     self.complete_sep =  re.compile('[\s\{\}\[\]\(\)]')
+     self.updateNamespace({'exit':lambda:None})
+     self.updateNamespace({'quit':lambda:None})
+-    self.IP.readline_startup_hook(self.IP.pre_readline)
++    if parse_version(IPython.release.version) < parse_version("5.0.0"):
++      self.IP.readline_startup_hook(self.IP.pre_readline)
+     # Workaround for updating namespace with sys.modules
+     #
+     self.__update_namespace()
+@@ -208,13 +209,16 @@ class IterableIPShell:
+     # Backwards compatibility with ipyton-0.11
+     #
+     ver = IPython.__version__
+-    if '0.11' in ver:
++    if ver[0:4] == '0.11':
+         prompt = self.IP.hooks.generate_prompt(is_continuation)
+-    else:
++    elif parse_version(IPython.release.version) < parse_version("5.0.0"):
+         if is_continuation:
+             prompt = self.IP.prompt_manager.render('in2')
+         else:
+             prompt = self.IP.prompt_manager.render('in')
++    else:
++        # TODO: update to IPython 5.x and later
++        prompt = "In [%d]: " % self.IP.execution_count
+ 
+     return prompt
+ 

Modified: desktop/unstable/accerciser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/accerciser/debian/patches/series?rev=53730&op=diff
==============================================================================
--- desktop/unstable/accerciser/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/accerciser/debian/patches/series	[utf-8] Tue Sep 12 14:57:08 2017
@@ -1 +1,2 @@
 01_remove_site_package_version.patch
+02_ipython5.patch