--- a/libpurple/purple-url-handler Sun Nov 16 01:40:25 2014 -0500
+++ b/libpurple/purple-url-handler Thu Jul 09 07:35:21 2015 +0200
@@ -1,19 +1,19 @@
obj = bus.get_object("im.pidgin.purple.PurpleService",
"/im/pidgin/purple/PurpleObject")
-except dbus.DBusException, e:
+except dbus.DBusException as e: if e._dbus_error_name == "org.freedesktop.DBus.Error.ServiceUnknown":
- print "Error: no libpurple-powered client is running. Try starting Pidgin or Finch."
+ print("Error: no libpurple-powered client is running. Try starting Pidgin or Finch.") purple = dbus.Interface(obj, "im.pidgin.purple.PurpleInterface")
@@ -59,7 +59,7 @@
- print "No matching account found."
+ print("No matching account found.") def bring_account_online(account):
@@ -122,16 +122,16 @@
match = re.match(r"^aim:([^?]*)(\?(.*))", uri)
- print "Invalid aim URI: %s" % uri
+ print("Invalid aim URI: %s" % uri) - command = urllib.unquote_plus(match.group(1))
+ command = urllib.parse.unquote(match.group(1)) paramstring = match.group(3)
for param in paramstring.split("&"):
key, value = extendlist(param.split("=", 1), 2, "")
- params[key] = urllib.unquote_plus(value)
+ params[key] = urllib.parse.unquote(value) accountname = params.get("account", "")
screenname = params.get("screenname", "")
@@ -148,10 +148,10 @@
match = re.match(r"^gg:(.*)", uri)
- print "Invalid gg URI: %s" % uri
+ print("Invalid gg URI: %s" % uri) - screenname = urllib.unquote_plus(match.group(1))
+ screenname = urllib.parse.unquote(match.group(1)) account = findaccount(protocol)
goim(account, screenname)
@@ -159,16 +159,16 @@
match = re.match(r"^icq:([^?]*)(\?(.*))", uri)
- print "Invalid icq URI: %s" % uri
+ print("Invalid icq URI: %s" % uri) - command = urllib.unquote_plus(match.group(1))
+ command = urllib.parse.unquote(match.group(1)) paramstring = match.group(3)
for param in paramstring.split("&"):
key, value = extendlist(param.split("=", 1), 2, "")
- params[key] = urllib.unquote_plus(value)
+ params[key] = urllib.parse.unquote(value) accountname = params.get("account", "")
screenname = params.get("screenname", "")
@@ -185,10 +185,10 @@
match = re.match(r"^irc:(//([^/]*))?/?([^?]*)(\?(.*))?", uri)
- print "Invalid irc URI: %s" % uri
+ print("Invalid irc URI: %s" % uri) - server = urllib.unquote_plus(match.group(2) or "")
+ server = urllib.parse.unquote(match.group(2) or "") target = match.group(3) or ""
query = match.group(5) or ""
@@ -204,7 +204,7 @@
for param in paramstring.split("&"):
key, value = extendlist(param.split("=", 1), 2, "")
- params[key] = urllib.unquote_plus(value)
+ params[key] = urllib.parse.unquote(value) def correct_server(account):
username = cpurple.PurpleAccountGetUsername(account)
@@ -214,9 +214,9 @@
- goim(account, urllib.unquote_plus(target.split(",")[0]), params.get("msg"))
+ goim(account, urllib.parse.unquote(target.split(",")[0]), params.get("msg")) - channel = urllib.unquote_plus(target.split(",")[0])
+ channel = urllib.parse.unquote(target.split(",")[0]) gochat(account, {"server": server, "channel": channel, "password": params.get("key", "")}, params.get("msg"))
@@ -225,16 +225,16 @@
match = re.match(r"^msnim:([^?]*)(\?(.*))", uri)
- print "Invalid msnim URI: %s" % uri
+ print("Invalid msnim URI: %s" % uri) - command = urllib.unquote_plus(match.group(1))
+ command = urllib.parse.unquote(match.group(1)) paramstring = match.group(3)
for param in paramstring.split("&"):
key, value = extendlist(param.split("=", 1), 2, "")
- params[key] = urllib.unquote_plus(value)
+ params[key] = urllib.parse.unquote(value) screenname = params.get("contact", "")
account = findaccount(protocol)
@@ -253,10 +253,10 @@
match = re.match(r"^sip:(.*)", uri)
- print "Invalid sip URI: %s" % uri
+ print("Invalid sip URI: %s" % uri) - screenname = urllib.unquote_plus(match.group(1))
+ screenname = urllib.parse.unquote(match.group(1)) account = findaccount(protocol)
goim(account, screenname)
@@ -264,20 +264,20 @@
match = re.match(r"^xmpp:(//([^/?#]*)/?)?([^?#]*)(\?([^;#]*)(;([^#]*))?)?(#(.*))?", uri)
- print "Invalid xmpp URI: %s" % uri
+ print("Invalid xmpp URI: %s" % uri) - accountname = urllib.unquote_plus(tmp)
+ accountname = urllib.parse.unquote(tmp) - screenname = urllib.unquote_plus(match.group(3))
+ screenname = urllib.parse.unquote(match.group(3)) - command = urllib.unquote_plus(tmp)
+ command = urllib.parse.unquote(tmp) @@ -286,7 +286,7 @@
for param in paramstring.split(";"):
key, value = extendlist(param.split("=", 1), 2, "")
- params[key] = urllib.unquote_plus(value)
+ params[key] = urllib.parse.unquote(value) account = findaccount(protocol, accountname)
@@ -304,16 +304,16 @@
match = re.match(r"^gtalk:([^?]*)(\?(.*))", uri)
- print "Invalid gtalk URI: %s" % uri
+ print("Invalid gtalk URI: %s" % uri) - command = urllib.unquote_plus(match.group(1))
+ command = urllib.parse.unquote(match.group(1)) paramstring = match.group(3)
for param in paramstring.split("&"):
key, value = extendlist(param.split("=", 1), 2, "")
- params[key] = urllib.unquote_plus(value)
+ params[key] = urllib.parse.unquote(value) accountname = params.get("from_jid", "")
jid = params.get("jid", "")
@@ -329,17 +329,17 @@
match = re.match(r"^ymsgr:([^?]*)(\?([^&]*)(&(.*))?)", uri)
- print "Invalid ymsgr URI: %s" % uri
+ print("Invalid ymsgr URI: %s" % uri) - command = urllib.unquote_plus(match.group(1))
- screenname = urllib.unquote_plus(match.group(3))
+ command = urllib.parse.unquote(match.group(1)) + screenname = urllib.parse.unquote(match.group(3)) paramstring = match.group(5)
for param in paramstring.split("&"):
key, value = extendlist(param.split("=", 1), 2, "")
- params[key] = urllib.unquote_plus(value)
+ params[key] = urllib.parse.unquote(value) account = findaccount(protocol)
@@ -353,8 +353,8 @@
if len(argv) != 2 or argv[1] == "--help" or argv[1] == "-h":
- print "Usage: %s URI" % argv[0]
- print "Example: %s \"xmpp:romeo@montague.net?message\"" % argv[0]
+ print("Usage: %s URI" % argv[0]) + print("Example: %s \"xmpp:romeo@montague.net?message\"" % argv[0]) @@ -386,9 +386,9 @@
- print "Unknown protocol: %s" % type
- except dbus.DBusException, e:
- print "Error: %s" % (e.message)
+ print("Unknown protocol: %s" % type) + except dbus.DBusException as e: + print("Error: %s" % e.message) if __name__ == "__main__":