summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-11-30 04:38:23 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-11-30 04:38:23 (GMT)
commit27ee75f1913452d7325a1dac7302d402150639f8 (patch)
tree3b05111fcccee3203fe38e40397469fa34eabdb5
parente39bba2ab18db15e629f1738f0daf269de086724 (diff)
parentb7138e24e3359810158a88e285aae6f34e8d4255 (diff)
downloadcpython-27ee75f1913452d7325a1dac7302d402150639f8.zip
cpython-27ee75f1913452d7325a1dac7302d402150639f8.tar.gz
cpython-27ee75f1913452d7325a1dac7302d402150639f8.tar.bz2
merge 3.4
-rw-r--r--Doc/library/xmlrpc.client.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst
index cc40920..e199931 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, context=None)
+ use_builtin_types=False, *, context=None)
.. versionchanged:: 3.3
The *use_builtin_types* flag was added.