43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
# HG changeset patch
|
|
# User Guillem Barba <guillembarba@gmail.com>
|
|
allow to provide ssl_context to set_xmlrpc()issue4592
|
|
|
|
|
|
review6951002
|
|
|
|
Index: proteus/config.py
|
|
===================================================================
|
|
|
|
--- a/proteus/proteus/config.py
|
|
+++ b/proteus/proteus/config.py
|
|
@@ -286,10 +286,14 @@
|
|
class XmlrpcConfig(Config):
|
|
'Configuration for XML-RPC'
|
|
|
|
- def __init__(self, url):
|
|
+ def __init__(self, url, **kwargs):
|
|
super(XmlrpcConfig, self).__init__()
|
|
self.url = url
|
|
- self.server = xmlrpclib.ServerProxy(url, allow_none=1, use_datetime=1)
|
|
+ if 'allow_none' not in kwargs:
|
|
+ kwargs['allow_none'] = 1
|
|
+ if 'use_datetime' not in kwargs:
|
|
+ kwargs['use_datetime'] = 1
|
|
+ self.server = xmlrpclib.ServerProxy(url, **kwargs)
|
|
# TODO add user
|
|
self.user = None
|
|
self._context = self.server.model.res.user.get_preferences(True, {})
|
|
@@ -320,9 +324,9 @@
|
|
and '.' not in x[len(object_) + 1:]]
|
|
|
|
|
|
-def set_xmlrpc(url):
|
|
+def set_xmlrpc(url, **kwargs):
|
|
'Set XML-RPC as backend'
|
|
- _CONFIG.current = XmlrpcConfig(url)
|
|
+ _CONFIG.current = XmlrpcConfig(url, **kwargs)
|
|
return _CONFIG.current
|
|
|
|
|
|
|