r26816 - in /desktop/experimental/pygobject/debian: changelog patches/30_[gi-overrides]-fix-exception-block-so-it-works-in-Python-2.5.patch patches/series

[bigon at users.alioth.debian.org]

Author: bigon
Date: Thu Mar 10 22:14:32 2011
New Revision: 26816

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26816
Log:
d/p/30_[gi-overrides]-fix-exception-block-so-it-works-in-Python-2.5.patch:
Make exception compatible with python 2.5 (taken from upstream)

Added:
    desktop/experimental/pygobject/debian/patches/30_[gi-overrides]-fix-exception-block-so-it-works-in-Python-2.5.patch
Modified:
    desktop/experimental/pygobject/debian/changelog
    desktop/experimental/pygobject/debian/patches/series

Modified: desktop/experimental/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/changelog?rev=26816&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/changelog [utf-8] (original)
+++ desktop/experimental/pygobject/debian/changelog [utf-8] Thu Mar 10 22:14:32 2011
@@ -13,8 +13,10 @@
   * debian/copyright: Update copyright file
   * debian/rules: Remove explicit calls to quilt as we are using '3.0 (quilt)'
     format
-
- -- Laurent Bigonville <bigon at debian.org>  Thu, 10 Mar 2011 22:54:37 +0100
+  * d/p/30_[gi-overrides]-fix-exception-block-so-it-works-in-Python-2.5.patch:
+    Make exception compatible with python 2.5 (taken from upstream)
+
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 10 Mar 2011 22:57:15 +0100
 
 pygobject (2.27.0-2) experimental; urgency=low
 

Added: desktop/experimental/pygobject/debian/patches/30_[gi-overrides]-fix-exception-block-so-it-works-in-Python-2.5.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/patches/30_%5Bgi-overrides%5D-fix-exception-block-so-it-works-in-Python-2.5.patch?rev=26816&op=file
==============================================================================
--- desktop/experimental/pygobject/debian/patches/30_[gi-overrides]-fix-exception-block-so-it-works-in-Python-2.5.patch (added)
+++ desktop/experimental/pygobject/debian/patches/30_[gi-overrides]-fix-exception-block-so-it-works-in-Python-2.5.patch [utf-8] Thu Mar 10 22:14:32 2011
@@ -1,0 +1,31 @@
+From f06ad511725b28d821532acae45a25d0a186fc9f Mon Sep 17 00:00:00 2001
+From: John (J5) Palmieri <johnp at redhat.com>
+Date: Wed, 09 Mar 2011 18:02:50 +0000
+Subject: [gi-overrides] fix exception block so it works in Python 2.5
+
+---
+diff --git a/gi/overrides/Gio.py b/gi/overrides/Gio.py
+index 20343a2..aa37784 100644
+--- a/gi/overrides/Gio.py
++++ b/gi/overrides/Gio.py
+@@ -23,6 +23,8 @@ from ..importer import modules
+ 
+ from gi.repository import GLib
+ 
++import sys
++
+ Gio = modules['Gio']._introspection_module
+ 
+ __all__ = []
+@@ -109,7 +111,8 @@ class _DBusProxyMethodCall:
+         (result_callback, error_callback, real_user_data) = user_data
+         try:
+             ret = obj.call_finish(result)
+-        except Exception as e:
++        except Exception:
++            etype, e = sys.exc_info()[:2]
+             # return exception as value
+             if error_callback:
+                 error_callback(obj, e, real_user_data)
+--
+cgit v0.8.3.4

Modified: desktop/experimental/pygobject/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/patches/series?rev=26816&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/patches/series [utf-8] (original)
+++ desktop/experimental/pygobject/debian/patches/series [utf-8] Thu Mar 10 22:14:32 2011
@@ -1,1 +1,2 @@
 20_deprecated_spam.patch
+30_[gi-overrides]-fix-exception-block-so-it-works-in-Python-2.5.patch