summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2014-10-20 13:40:59 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2014-10-20 13:40:59 -0500
commit3f313963ce769997fe47ff54c95bc44bab9c952d (patch)
treef5b78c2d98dc5e46df27436777688812e632e506 /src/lib
parent0694a930f3b7c7a903698ecaa14a4f2a4d96089f (diff)
parentaf68bd2049ac7654e67cef5dcd54160133eef25d (diff)
downloadbcfg2-3f313963ce769997fe47ff54c95bc44bab9c952d.tar.gz
bcfg2-3f313963ce769997fe47ff54c95bc44bab9c952d.tar.bz2
bcfg2-3f313963ce769997fe47ff54c95bc44bab9c952d.zip
Merge pull request #218 from AlexanderS/fix-arguments
Client/Proxy: use keyword arguments to match the correct order
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Bcfg2/Client/Proxy.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Client/Proxy.py b/src/lib/Bcfg2/Client/Proxy.py
index fca4da66f..679b4c52b 100644
--- a/src/lib/Bcfg2/Client/Proxy.py
+++ b/src/lib/Bcfg2/Client/Proxy.py
@@ -332,11 +332,12 @@ class ComponentProxy(xmlrpclib.ServerProxy):
path)
else:
url = Bcfg2.Options.setup.server
- ssl_trans = XMLRPCTransport(Bcfg2.Options.setup.key,
- Bcfg2.Options.setup.cert,
- Bcfg2.Options.setup.ca,
- Bcfg2.Options.setup.ssl_cns,
- Bcfg2.Options.setup.client_timeout,
- Bcfg2.Options.setup.protocol)
+ ssl_trans = XMLRPCTransport(
+ key=Bcfg2.Options.setup.key,
+ cert=Bcfg2.Options.setup.cert,
+ ca=Bcfg2.Options.setup.ca,
+ scns=Bcfg2.Options.setup.ssl_cns,
+ timeout=Bcfg2.Options.setup.client_timeout,
+ protocol=Bcfg2.Options.setup.protocol)
xmlrpclib.ServerProxy.__init__(self, url,
allow_none=True, transport=ssl_trans)