Sugar-toolkit: disable ipython; bump version (15)

2 files changed, 71 insertions, 1 deletions

diff --git a/rpms/sugar-toolkit/sugar-toolkit-Get-rid-of-IPython.patch b/rpms/sugar-toolkit/sugar-toolkit-Get-rid-of-IPython.patch
new file mode 100644
index 0000000..4b9b1ef
--- /dev/null
+++ b/rpms/sugar-toolkit/sugar-toolkit-Get-rid-of-IPython.patch
@@ -0,0 +1,62 @@
+From patchwork Sat Feb 12 01:51:47 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [sugar-toolkit] Get rid of IPython
+Date: Sat, 12 Feb 2011 06:51:47 -0000
+From: Aleksey Lim <alsroot@activitycentral.org>
+X-Patchwork-Id: 646
+Message-Id: <1297475507-1009-1-git-send-email-alsroot@activitycentral.org>
+To: dextrose@lists.sugarlabs.org
+
+It is bugg on fc11, failed to print traceback due to internal import errors.
+
+---
+src/sugar/feedback.py |   23 +++--------------------
+ 1 files changed, 3 insertions(+), 20 deletions(-)
+
+diff --git a/src/sugar/feedback.py b/src/sugar/feedback.py
+index 770b7a7..5833d61 100644
+--- a/src/sugar/feedback.py
++++ b/src/sugar/feedback.py
+@@ -28,7 +28,6 @@ _SHELL_IFACE = "org.laptop.Shell"
+ 
+ _report = {}
+ _need_log = False
+-_log_formatter = None
+ 
+ 
+ def start(activity_id, log_path=None):
+@@ -79,29 +78,13 @@ def _send(activity_id, log_path):
+             log_path if need_log else '')
+ 
+ 
+-def _format_exception(exctype, value, tb):
+-    import traceback
+-    return ''.join(traceback.format_exception(exctype, value, tb))
+-
+-
+ def _excepthook(exctype, value, tb):
+-    global _log_formatter
+-
+-    if _log_formatter is None:
+-        try:
+-            # Attempt to provide verbose IPython tracebacks.
+-            # Importing IPython is slow, so we import it lazily.
+-            from IPython.ultraTB import AutoFormattedTB
+-            formatter = AutoFormattedTB(mode='Verbose', color_scheme='NoColor')
+-            _log_formatter = formatter.text
+-        except BaseException:
+-            _log_formatter = _format_exception
+-
+     try:
+-        message = _log_formatter(exctype, value, tb)
++        import traceback
++        message = ''.join(traceback.format_exception(exctype, value, tb))
+         logging.error(message)
+         trigger('unhandled_exception', need_log=True)
+-    except BaseException, error:
++    except Exception, error:
+         print >>sys.stderr, 'Unhandled %r while processing: %r %r' % \
+                 (error, exctype, value)
+ 
diff --git a/rpms/sugar-toolkit/sugar-toolkit.spec b/rpms/sugar-toolkit/sugar-toolkit.spec
index af892ca..64b0678 100644
--- a/rpms/sugar-toolkit/sugar-toolkit.spec
+++ b/rpms/sugar-toolkit/sugar-toolkit.spec
@@ -3,7 +3,7 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.88.1
-Release: 4.14dxo%{?dist}
+Release: 4.15dxo%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 Source1: macros.sugar
@@ -61,6 +61,9 @@ patch1001: sugar-toolkit-More-robust-handling-of-unhandled-exceptions.patch
 #ctime workaround
 patch1101: set-ctime-workaround.patch
 
+#get rid of ipython
+patch1201: sugar-toolkit-Get-rid-of-IPython.patch
+
 License: LGPLv2+
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -134,6 +137,8 @@ to interact with system services like presence and the datastore.
 
 %patch1101 -p1
 
+%patch1201 -p1
+
 %build
 autoreconf
 %configure
@@ -162,6 +167,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Sat Feb 12 2011 Anish Mangal <anish@sugarlabs.org> - 0.88.1-4.15
+- Get rid of ipython
+
 * Tue Feb  1 2011 Anish Mangal <anish@sugarlabs.org> - 0.88.1-4.14
 - More robust handling of exceptions
 - sl#2201 fix