besser82 / rpms / pidgin

Forked from rpms/pidgin 6 years ago
Clone
78e12e8
Actually make things work in python3.
78e12e8
78e12e8
Author: Jan Synacek <jsynacek@redhat.com>
78e12e8
b102f80
--- a/libpurple/purple-remote	2015-06-03 09:52:26.324668688 +0200
b102f80
+++ b/libpurple/purple-remote	2015-06-03 09:55:41.287253981 +0200
b102f80
@@ -3,13 +3,13 @@
b102f80
 import codecs
b102f80
 import dbus
b102f80
 import re
b102f80
-import urllib
b102f80
+import urllib.parse
b102f80
 import sys
b102f80
 
78e12e8
 import xml.dom.minidom 
78e12e8
 
78e12e8
 sys.stdin = codecs.getwriter('utf-8')(sys.stdin);
78e12e8
-sys.stdout = codecs.getwriter('utf-8')(sys.stdout);
78e12e8
+sys.stdout = codecs.getwriter('utf-8')(sys.stdout.detach());
78e12e8
 
78e12e8
 xml.dom.minidom.Element.all   = xml.dom.minidom.Element.getElementsByTagName
78e12e8
 
78e12e8
@@ -41,7 +41,7 @@ class CheckedAttribute:
78e12e8
         return result
78e12e8
             
78e12e8
 def show_help(requested=False):
78e12e8
-    print """This program uses D-Bus to communicate with purple.
78e12e8
+    print("""This program uses D-Bus to communicate with purple.
78e12e8
 
78e12e8
 Usage:
78e12e8
 
78e12e8
@@ -72,7 +72,7 @@ Examples of commands:
78e12e8
 
78e12e8
     PurpleAccountsFindConnected?name=&protocol=prpl-jabber
78e12e8
     PurpleAccountsFindConnected(,prpl-jabber)
78e12e8
-""" % sys.argv[0]
78e12e8
+""" % sys.argv[0])
78e12e8
     if (requested):
78e12e8
         sys.exit(0)
78e12e8
     else:
b102f80
@@ -120,7 +120,7 @@ def execute(uri):
b102f80
     if paramstring is not None:
b102f80
         for param in paramstring.split("&"):
b102f80
             key, value = extendlist(param.split("=",1), 2, "")
b102f80
-            params[key] = urllib.unquote(value)
b102f80
+            params[key] = urllib.parse.unquote(value)
b102f80
 
b102f80
     accountname = params.get("account", "")
b102f80
 
78e12e8
@@ -233,12 +233,12 @@ if len(sys.argv) == 1:
78e12e8
 elif (sys.argv[1] == "--help" or sys.argv[1] == "-h"):
78e12e8
     show_help(True)
78e12e8
 elif (obj == None):
78e12e8
-    print "No existing libpurple instance detected."
78e12e8
+    print("No existing libpurple instance detected.")
78e12e8
     sys.exit(1);
78e12e8
     
78e12e8
 for arg in sys.argv[1:]:
78e12e8
     output = execute(arg)
78e12e8
 
78e12e8
     if (output != None):
78e12e8
-        print output
78e12e8
+        print(output)
78e12e8