[Pkg-sugar-commit] [sugar-base] 03/08: Add patch 1002 to add compatibility with ipython 0.11. Closes: bug#635289. Thanks to Julian Taylor.

[Jonas Smedegaard]

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

js pushed a commit to annotated tag debian/0.86.0-6
in repository sugar-base.

commit fcfb57e7032ee01d76896483f77ae6bbc1949a4e
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jul 25 00:09:51 2011 +0200

    Add patch 1002 to add compatibility with ipython 0.11. Closes: bug#635289. Thanks to Julian Taylor.
    
    Conflicts:
    
    	debian/patches/series
---
 debian/patches/1002_modernize_ipython_support.patch | 20 ++++++++++++++++++++
 debian/patches/series                               |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/1002_modernize_ipython_support.patch b/debian/patches/1002_modernize_ipython_support.patch
new file mode 100644
index 0000000..80e582e
--- /dev/null
+++ b/debian/patches/1002_modernize_ipython_support.patch
@@ -0,0 +1,20 @@
+Description: add compatibility with ipython 0.11
+ AutoFormattedTB now is in IPython.core.
+ Both possibilities are tried to remain compatible with older
+ ipython versions.
+Author: Julian Taylor <jtaylor.debian at googlemail.com>
+
+--- a/src/sugar/logger.py
++++ b/src/sugar/logger.py
+@@ -70,7 +70,10 @@
+     # Attempt to provide verbose IPython tracebacks.
+     # Importing IPython is slow, so we import it lazily.
+     try:
+-        from IPython.ultraTB import AutoFormattedTB
++        try:
++            from IPython.core.ultratb import AutoFormattedTB
++        except ImportError:
++            from IPython.ultraTB import AutoFormattedTB
+         sys.excepthook = AutoFormattedTB(mode='Verbose',
+             color_scheme='NoColor')
+     except ImportError:
diff --git a/debian/patches/series b/debian/patches/series
index 8e92a82..2046ed8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 1001_enable_danish_l10n.patch
+1002_modernize_ipython_support.patch
 2991_enable_danish_l10n.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-base.git