merge 3.4

2014-11-29 23:38:23 -05:00 · 2014-11-29 23:38:23 -05:00 · 27ee75f191
parent e39bba2ab1 b7138e24e3
commit 27ee75f191
1 changed files with 1 additions and 1 deletions
--- 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.