address issue #7, incompatible with python3; also issue #6, client_set_key

lcdproc/server.py

@@ -1,5 +1,9 @@
+from __future__ import print_function
 import telnetlib
-import urllib
+try:
+    from urllib import unquote
+except ImportError:
+    from urllib.parse import unquote
 import select
 
 from screen import Screen
@@ -43,9 +47,9 @@ def request(self, command_string):
         """ Request """
 
         self.tn.write((command_string + "\n").encode())
-        if self.debug: print "Telnet Request:  %s" % (command_string)
+        if self.debug: print("Telnet Request:", command_string)
         while True:
-            response = urllib.unquote(self.tn.read_until(b"\n").decode())
+            response = unquote(self.tn.read_until(b"\n").decode())
             if "success" in response:   # Normal successful reply
                 break
             if "huh" in response:       # Something went wrong
@@ -54,7 +58,7 @@ def request(self, command_string):
                 break
             # TODO Keep track of which screen is displayed
             # Try again if response was key, menu or visibility notification.
-        if "huh" in response or self.debug: print "Telnet Response: %s" % (response[:-1])
+        if "huh" in response or self.debug: print("Telnet Response:", response[:-1])
         return response
 
 
@@ -66,8 +70,8 @@ def poll(self):
         LCDd generates strings for key presses, menu events & screen visibility changes.
         """
         if select.select([self.tn], [], [], 0) == ([self.tn], [], []):
-            response = urllib.unquote(self.tn.read_until(b"\n").decode())
-            if self.debug: print "Telnet Poll: %s" % (response[:-1])
+            response = unquote(self.tn.read_until(b"\n").decode())
+            if self.debug: print("Telnet Poll:", response[:-1])
             # TODO Keep track of which screen is displayed
             return response
         else:
@@ -99,7 +103,7 @@ def add_key(self, ref, mode = "shared"):
         Return key name or None on error
         """
         if ref not in self.keys:   
-            response = self.request("client_add_key %s -%s" % (ref, mode))
+            response = self.request("client_add_key -%s %s" % (mode, ref))
             if "success" not in response: return None
             self.keys.append(ref)
             return ref