Package: sugar-base-0.90
Version: 0.90.1-1
Severity: normal
Tags: patch

ipython 0.11 currently in debian experimental has a new api for a couple of
operations.
This includes the AutoFormattedTB used by sugar-base.
The formatter is now in IPython.core instead of IPython.

Attached patch tries both variants and is thus compatible with 0.11 and older
versions.
It should also applies to all the other sugar versions in the archive, please
apply it to all so ipython can transition to unstable.



-- System Information:
Debian Release: squeeze/sid
  APT prefers natty-updates
  APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 
'natty-proposed'), (500, 'natty'), (100, 'natty-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
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.deb...@googlemail.com>
Index: sugar-base-0.90-0.90.1/src/sugar/logger.py
===================================================================
--- sugar-base-0.90-0.90.1.orig/src/sugar/logger.py	2011-07-24 19:30:00.528725506 +0200
+++ sugar-base-0.90-0.90.1/src/sugar/logger.py	2011-07-24 19:30:23.818725515 +0200
@@ -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:

Reply via email to