Ensure all Python scripts are Py3k compatible.

9 files changed, 36 insertions, 22 deletions

diff --git a/finch/plugins/pietray.py b/finch/plugins/pietray.py
index eaf6d77526..199dcad112 100755
--- a/finch/plugins/pietray.py
+++ b/finch/plugins/pietray.py
@@ -17,6 +17,8 @@
 # 
 # Sadrul <sadrul@pidgin.im>
 
+from __future__ import absolute_import, division, print_function
+
 import pygtk
 pygtk.require("2.0")
 import gtk
diff --git a/libpurple/dbus-analyze-functions.py b/libpurple/dbus-analyze-functions.py
index 4e26656644..92b93d2757 100644
--- a/libpurple/dbus-analyze-functions.py
+++ b/libpurple/dbus-analyze-functions.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 import re
 import string
 import sys
@@ -97,7 +97,7 @@ def ctopascal(name):
         newname += word.capitalize()
     return newname
 
-class Parameter:
+class Parameter(object):
     def __init__(self, type, name):
         self.name = name
         self.type = type
@@ -115,7 +115,7 @@ class Parameter:
                     
     fromtokens = staticmethod(fromtokens)
 
-class Binding:
+class Binding(object):
     def __init__(self, functiontext, paramtexts):
         self.function = Parameter.fromtokens(functiontext.split())
 
@@ -528,7 +528,7 @@ class ServerBinding (Binding):
                                % (name, "len"))
         self.addouttype("ay", name)
 
-class BindingSet:
+class BindingSet(object):
     regexp = r"^(\w[^()]*)\(([^()]*)\)\s*;\s*$";
 
     def __init__(self, inputfile, fprefix):
diff --git a/libpurple/dbus-analyze-signals.py b/libpurple/dbus-analyze-signals.py
index fe92c7d81d..dda628ff68 100644
--- a/libpurple/dbus-analyze-signals.py
+++ b/libpurple/dbus-analyze-signals.py
@@ -5,7 +5,7 @@
 #   <signal name="Changed">
 #       <arg name="new_value" type="b"/>
 #   </signal>
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 import re
 import sys
 
diff --git a/libpurple/dbus-analyze-types.py b/libpurple/dbus-analyze-types.py
index 548a879788..bae7e3f0c3 100644
--- a/libpurple/dbus-analyze-types.py
+++ b/libpurple/dbus-analyze-types.py
@@ -14,7 +14,7 @@
 #           NAME3
 #
 
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 import re
 import sys
 
diff --git a/libpurple/plugins/dbus-buddyicons-example.py b/libpurple/plugins/dbus-buddyicons-example.py
index 18cca12327..01b5e2ba23 100644
--- a/libpurple/plugins/dbus-buddyicons-example.py
+++ b/libpurple/plugins/dbus-buddyicons-example.py
@@ -21,7 +21,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 #
 
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
+
 import dbus
 
 bus = dbus.SessionBus()
diff --git a/libpurple/plugins/startup.py b/libpurple/plugins/startup.py
index 441b24d96c..d420333c31 100644
--- a/libpurple/plugins/startup.py
+++ b/libpurple/plugins/startup.py
@@ -21,7 +21,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 #
 
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
+
 import sys
 import dbus
 import os
diff --git a/libpurple/purple-notifications-example b/libpurple/purple-notifications-example
index 2ecfeefad7..4166b115b0 100644
--- a/libpurple/purple-notifications-example
+++ b/libpurple/purple-notifications-example
@@ -8,6 +8,8 @@
 # Note that all function names are resolved dynamically, no
 # purple-specific library is needed.
 
+from __future__ import absolute_import, division, print_function
+
 import dbus
 import dbus.glib
 import dbus.decorators
@@ -77,8 +79,9 @@ bus.add_signal_receiver(buddysignedon,
                         dbus_interface = "im.pidgin.purple.PurpleInterface",
                         signal_name = "BuddySignedOn")
 
-print "This is a simple purple notification server."
-print "It shows notifications when your buddy signs on or you get an IM message."
+print("This is a simple purple notification server.")
+print("It shows notifications when your buddy signs on or you get an "
+      "IM message.")
 
 loop = gobject.MainLoop()
 loop.run()
diff --git a/libpurple/purple-remote b/libpurple/purple-remote
index 902ab50c94..9538281091 100755
--- a/libpurple/purple-remote
+++ b/libpurple/purple-remote
@@ -1,9 +1,14 @@
 #!/usr/bin/env python
 
+from __future__ import absolute_import, division, print_function
+
 import codecs
 import dbus
 import re
-import urllib
+try:
+    from urllib.parse import unquote
+except ImportError:
+    from urllib import unquote
 import sys
 
 import xml.dom.minidom 
@@ -21,14 +26,14 @@ except:
 
 purple = dbus.Interface(obj, "im.pidgin.purple.PurpleInterface")
 
-class CheckedObject:
+class CheckedObject(object):
     def __init__(self, obj):
         self.obj = obj
 
     def __getattr__(self, attr):
         return CheckedAttribute(self, attr)
 
-class CheckedAttribute:
+class CheckedAttribute(object):
     def __init__(self, cobj, attr):
         self.cobj = cobj
         self.attr = attr
@@ -41,7 +46,7 @@ class CheckedAttribute:
         return result
             
 def show_help(requested=False):
-    print """This program uses D-Bus to communicate with purple.
+    print("""This program uses D-Bus to communicate with purple.
 
 Usage:
 
@@ -72,7 +77,7 @@ Examples of commands:
 
     PurpleAccountsFindConnected?name=&protocol=prpl-jabber
     PurpleAccountsFindConnected(,prpl-jabber)
-""" % sys.argv[0]
+""" % (sys.argv[0], ))
     if (requested):
         sys.exit(0)
     else:
@@ -120,7 +125,7 @@ def execute(uri):
     if paramstring is not None:
         for param in paramstring.split("&"):
             key, value = extendlist(param.split("=",1), 2, "")
-            params[key] = urllib.unquote(value)
+            params[key] = unquote(value)
 
     accountname = params.get("account", "")
 
@@ -233,12 +238,12 @@ if len(sys.argv) == 1:
 elif (sys.argv[1] == "--help" or sys.argv[1] == "-h"):
     show_help(True)
 elif (obj == None):
-    print "No existing libpurple instance detected."
+    print("No existing libpurple instance detected.")
     sys.exit(1);
     
 for arg in sys.argv[1:]:
     output = execute(arg)
 
     if (output != None):
-        print output
+        print(output)
 
diff --git a/libpurple/purple-url-handler b/libpurple/purple-url-handler
index 612172bec8..23f48e10e9 100755
--- a/libpurple/purple-url-handler
+++ b/libpurple/purple-url-handler
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
-from __future__ import print_function
+
+from __future__ import absolute_import, division, print_function
+
 import dbus
 import re
 import sys
@@ -20,14 +22,14 @@ except dbus.DBusException as e:
         sys.exit(1)
 purple = dbus.Interface(obj, "im.pidgin.purple.PurpleInterface")
 
-class CheckedObject:
+class CheckedObject(object):
     def __init__(self, obj):
         self.obj = obj
 
     def __getattr__(self, attr):
         return CheckedAttribute(self, attr)
 
-class CheckedAttribute:
+class CheckedAttribute(object):
     def __init__(self, cobj, attr):
         self.cobj = cobj
         self.attr = attr
@@ -332,7 +334,7 @@ def main(argv=sys.argv):
         else:
             print("Unknown protocol: %s" % type)
     except dbus.DBusException as e:
-        print("Error: %s" % e.message)
+        print("Error: %s" % (str(e), ))
         sys.exit(1)
 
 if __name__ == "__main__":