comparison libpurple/purple-remote @ 31414:d63748b78769

Fix purple-remote on Python 2.6+. Use Exception objects instead of string exceptions, which are no longer supported on 2.6+. Fixes #12151. committer: Elliott Sales de Andrade <qulogic@pidgin.im>
author Ari Pollak <ari@debian.org>
date Sat, 27 Nov 2010 22:36:49 +0000
parents 2c7d3c224f39
children
comparison
equal deleted inserted replaced
31412:72e6fa6caecc 31414:d63748b78769
34 self.attr = attr 34 self.attr = attr
35 35
36 def __call__(self, *args): 36 def __call__(self, *args):
37 result = self.cobj.obj.__getattr__(self.attr)(*args) 37 result = self.cobj.obj.__getattr__(self.attr)(*args)
38 if result == 0: 38 if result == 0:
39 raise "Error: " + self.attr + " " + str(args) + " returned " + str(result) 39 raise Exception("Error: %s %s returned %s" %
40 (self.attr, args, result))
40 return result 41 return result
41 42
42 def show_help(requested=False): 43 def show_help(requested=False):
43 print """This program uses D-Bus to communicate with purple. 44 print """This program uses D-Bus to communicate with purple.
44 45
221 if type == "s": 222 if type == "s":
222 methodparams.append(value) 223 methodparams.append(value)
223 elif type == "i": 224 elif type == "i":
224 methodparams.append(int(value)) 225 methodparams.append(int(value))
225 else: 226 else:
226 raise "Don't know how to handle type \"%s\"" % type 227 raise Exception("Don't know how to handle type \"%s\"" % type)
227 return purple.__getattr__(command)(*methodparams) 228 return purple.__getattr__(command)(*methodparams)
228 show_help() 229 show_help()
229 230
230 if len(sys.argv) == 1: 231 if len(sys.argv) == 1:
231 show_help() 232 show_help()