Tagging module NodeManager - NodeManager-1.7-47

[nodemanager.git] / plcapi.py

diff --git a/plcapi.py b/plcapi.py
index 86d04c9..759207e 100644 (file)
--- a/plcapi.py
+++ b/plcapi.py
@@ -1,3 +1,5 @@
+# $Id$
+
 import safexmlrpc
 import hmac, sha
 
@@ -15,7 +17,7 @@ class PLCAPI:
     the new session-based method.
     """
 
-    def __init__(self, uri, cacert, auth, timeout = 300, **kwds):
+    def __init__(self, uri, cacert, auth, timeout = 90, **kwds):
         if isinstance(auth, (tuple, list)):
             (self.node_id, self.key) = auth
             self.session = None
@@ -64,7 +66,8 @@ class PLCAPI:
 
             if self.session is not None:
                 # Use session authentication
-                auth = {'session': self.session}
+                auth = {'AuthMethod': "session",
+                        'session': self.session}
             else:
                 # Yes, this is the "canonicalization" method used.
                 args = canonicalize(params)