summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-11-30 04:32:57 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-11-30 04:32:57 (GMT)
commitc1da3d1ed86284cc49cd7880a57a404de8965b24 (patch)
treea4a719096636491b3860437d6ec03df96f91284b /Doc
parent2b3b95be6221a30f00fa110cb1a9a1f2aeb684c6 (diff)
downloadcpython-c1da3d1ed86284cc49cd7880a57a404de8965b24.zip
cpython-c1da3d1ed86284cc49cd7880a57a404de8965b24.tar.gz
cpython-c1da3d1ed86284cc49cd7880a57a404de8965b24.tar.bz2
add context parameter to xmlrpclib.ServerProxy (#22960)
Patch by Alex Gaynor.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/xmlrpc.client.rst9
1 files changed, 7 insertions, 2 deletions
diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst
index c06345e..87ac86a 100644
--- a/Doc/library/xmlrpc.client.rst
+++ b/Doc/library/xmlrpc.client.rst
@@ -34,7 +34,7 @@ between conformable Python objects and XML on the wire.
.. class:: ServerProxy(uri, transport=None, encoding=None, verbose=False, \
allow_none=False, use_datetime=False, \
- use_builtin_types=False)
+ use_builtin_types=False, context=None)
.. versionchanged:: 3.3
The *use_builtin_types* flag was added.
@@ -63,7 +63,9 @@ between conformable Python objects and XML on the wire.
portion will be base64-encoded as an HTTP 'Authorization' header, and sent to
the remote server as part of the connection process when invoking an XML-RPC
method. You only need to use this if the remote server requires a Basic
- Authentication user and password.
+ Authentication user and password. If an HTTPS url is provided, *context* may
+ be :class:`ssl.SSLContext` and configures the SSL settings of the underlying
+ HTTPS connection.
The returned instance is a proxy object with methods that can be used to invoke
corresponding RPC calls on the remote server. If the remote server supports the
@@ -127,6 +129,9 @@ between conformable Python objects and XML on the wire.
:class:`Server` is retained as an alias for :class:`ServerProxy` for backwards
compatibility. New code should use :class:`ServerProxy`.
+ .. versionchanged:: 3.4.3
+ Added the *context* argument.
+
.. seealso::