[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/13e286c718cb
changeset:   93664:13e286c718cb
parent:      93662:2a126ce6f83e
parent:      93663:086a21998db2
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Nov 29 23:38:23 2014 -0500
summary:
  merge 3.4

files:
  Doc/library/xmlrpc.client.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst
--- a/Doc/library/xmlrpc.client.rst
+++ b/Doc/library/xmlrpc.client.rst
@@ -34,7 +34,7 @@
 
 .. 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.

-- 
Repository URL: https://hg.python.org/cpython