-import xmlrpclib
+import safexmlrpc
import hmac, sha
class PLCAPI:
"""
- Wrapper around xmlrpclib.ServerProxy to automagically add an Auth
+ Wrapper around safexmlrpc.ServerProxy to automagically add an Auth
struct as the first argument to every XML-RPC call. Initialize
auth with either:
the new session-based method.
"""
- def __init__(self, uri, auth, **kwds):
+ def __init__(self, uri, cacert, auth, timeout = 300, **kwds):
if isinstance(auth, (tuple, list)):
(self.node_id, self.key) = auth
self.session = None
self.node_id = self.key = None
self.session = auth
- self.server = xmlrpclib.ServerProxy(uri, allow_none = 1, **kwds)
+ self.server = safexmlrpc.ServerProxy(uri, cacert, timeout, allow_none = 1, **kwds)
def add_auth(self, function):
"""
if isinstance(arg, list) or isinstance(arg, tuple):
# The old implementation did not recursively handle
# lists of lists. But neither did the old API itself.
- values += self.canonicalize(arg)
+ values += canonicalize(arg)
elif isinstance(arg, dict):
# Yes, the comments in the old implementation are
# misleading. Keys of dicts are not included in the
# hash.
- values += self.canonicalize(arg.values())
+ values += canonicalize(arg.values())
else:
# We use unicode() instead of str().
values.append(unicode(arg))
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)