X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=blobdiff_plain;f=plcapi.py;h=a03e9e0cafda730a96001181d8ede841ed12e78d;hp=a6a74a45ac23b057d2724306c39937cb5f1fb96d;hb=HEAD;hpb=d3a3b2d3ea98e72183d1cb5497c38badaa0c5863

diff --git a/plcapi.py b/plcapi.py
index a6a74a4..a03e9e0 100644
--- a/plcapi.py
+++ b/plcapi.py
@@ -1,6 +1,3 @@
-# $Id$
-# $URL$
-
 import safexmlrpc
 import hmac
 try:
@@ -31,7 +28,7 @@ class PLCAPI:
         if isinstance(auth, (tuple, list)):
             (self.node_id, self.key) = auth
             self.session = None
-        elif isinstance(auth, (str, unicode)):
+        elif isinstance(auth, str):
             self.node_id = self.key = None
             self.session = auth
         else:
@@ -88,10 +85,10 @@ class PLCAPI:
                     # Yes, the comments in the old implementation are
                     # misleading. Keys of dicts are not included in the
                     # hash.
-                    values += canonicalize(arg.values())
+                    values += canonicalize(list(arg.values()))
                 else:
                     # We use unicode() instead of str().
-                    values.append(unicode(arg))
+                    values.append(str(arg))
 
             return values