merge 3.4

This commit is contained in:
Benjamin Peterson 2014-10-13 11:55:11 -04:00
commit e6798bb551

View file

@ -27,6 +27,11 @@ between conformable Python objects and XML on the wire.
constructed data. If you need to parse untrusted or unauthenticated data see
:ref:`xml-vulnerabilities`.
.. warning::
In the case of https URIS, :mod:`xmlrpc.client` does not do any verification
of the server's certificate.
.. class:: ServerProxy(uri, transport=None, encoding=None, verbose=False, \
allow_none=False, use_datetime=False, \