Bug#561645: FYI, cannot run gdesklets with python2.6

[Andrew Starr-Bochicchio]

Package: gdesklets
Version: 0.36.1-3
Severity: wishlist
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu lucid ubuntu-patch

Just a heads up, gdesklets will not run with python2.6 See:

https://bugs.edge.launchpad.net/gdesklets/+bug/344079

The attached patch, resolves this issue. It has been applied in Ubuntu
and accepted upstream. It seems that Gentoo and Fedora have applied it
as well.

*** /tmp/tmpt438fH
-------------- next part --------------
only in patch2:
unchanged:
--- gdesklets-0.36.1.orig/debian/patches/10_python2.6.patch
+++ gdesklets-0.36.1/debian/patches/10_python2.6.patch
@@ -0,0 +1,18 @@
+Description: Fix exception when running under python2.6. Patch from Ubuntu, commited upstream.
+Origin: https://bugs.launchpad.net/gdesklets/+bug/344079
+Forwarded: http://bazaar.launchpad.net/~gdesklets-core-team/gdesklets/0.3x/revision/118
+diff -Nur -x '*.orig' -x '*~' gdesklets-0.36.1-2ubuntu1/utils/ErrorFormatter.py gdesklets-0.36.1-2ubuntu1.new/utils/ErrorFormatter.py
+--- gdesklets-0.36.1-2ubuntu1/utils/ErrorFormatter.py	2009-03-25 11:53:35.000000000 -0400
++++ gdesklets-0.36.1-2ubuntu1.new/utils/ErrorFormatter.py	2009-05-12 13:38:39.000000000 -0400
+@@ -113,9 +113,9 @@
+ # give us an absolute path.
+ #
+ _old_imp = __import__
+-def _new_imp(name, globs = {}, locls = {}, fromlist = []):
++def _new_imp(*args, **kwargs):
+ 
+-    module = _old_imp(name, globs, locls, fromlist)
++    module = _old_imp(*args, **kwargs)
+     # builtin modules have no "__file__" attribute, so we have to check for it
+     if (module):
+         if (hasattr(module, "__file__")):