-# $Id$
-# $URL$
-
import safexmlrpc
import hmac
try:
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:
def update_session(self, f="/usr/boot/plnode.txt"):
- # try authenticatipopulate /etc.planetlab/session
+ # try authenticatipopulate /etc.planetlab/session
def plnode(key):
try:
return [i[:-1].split('=') for i in open(f).readlines() if i.startswith(key)][0][1].strip('"')
open("/etc/planetlab/session", 'w').write(plc.GetSession().strip())
self.session = open("/etc/planetlab/session").read().strip()
-
+
def check_authentication(self):
authstatus = False
if self.key or self.session:
- try:
+ try:
authstatus = self.AuthCheck()
- except:
+ except:
logger.log_exc("plcapi: failed in plcapi.check_authentication")
return authstatus
# 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