pidgin: 9150bc33: Fix purple-remote on Python 2.6+.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 9150bc33060de0b745c92d457efe1bb135eb1229
Parent:   6e83e3c6034924be516805c89db4e25a5125eef2
Author:   ari at debian.org
Date:     11/27/10 17:36:49
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9150bc33060de0b745c92d457efe1bb135eb1229

Changelog: 

Fix purple-remote on Python 2.6+.

Use Exception objects instead of string exceptions, which are no
longer supported on 2.6+.

Fixes #12151.

Changes against parent 6e83e3c6034924be516805c89db4e25a5125eef2

  patched  ChangeLog
  patched  libpurple/purple-remote

-------------- next part --------------
============================================================
--- ChangeLog	1cfc5c48b22a8521fd2a59f2c37cd6f903a9b0cf
+++ ChangeLog	232700dbb7b0252dcf7425af5a255c6b65f2b411
@@ -1,6 +1,10 @@ version 2.7.8 (??/??/????):
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.7.8 (??/??/????):
+	General:
+	* Fix the exceptions in purple-remote on Python 2.6+. (Ari Pollak)
+	  (#12151)
+
 	MSN:
 	* Don't show ourselves in the list of endpoints that can be disconnected.
 
============================================================
--- libpurple/purple-remote	dec82db95d4c40ea1136b733d34392b4d4476db3
+++ libpurple/purple-remote	f3b808d70fe31851d75e64f6ee56e567aa933842
@@ -36,7 +36,8 @@ class CheckedAttribute:
     def __call__(self, *args):
         result = self.cobj.obj.__getattr__(self.attr)(*args)
         if result == 0:
-            raise "Error: " + self.attr + " " + str(args) + " returned " + str(result)
+            raise Exception("Error: %s %s returned %s" %
+                            (self.attr, args, result))
         return result
             
 def show_help(requested=False):
@@ -223,7 +224,7 @@ def execute(uri):
                             elif type == "i":
                                 methodparams.append(int(value))
                             else:
-                                raise "Don't know how to handle type \"%s\"" % type
+                                raise Exception("Don't know how to handle type \"%s\"" % type)
                     return purple.__getattr__(command)(*methodparams)
             show_help()