From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 30 Nov 2014 04:34:30 +0000 (-0500)
Subject: merge 3.4 (#22960)
X-Git-Tag: v3.5.0a1~410
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e39bba2ab18db15e629f1738f0daf269de086724;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#22960)
---

e39bba2ab18db15e629f1738f0daf269de086724
diff --cc Doc/library/xmlrpc.client.rst
index 1d87f49f770c,87ac86a07afa..cc40920644c5
--- a/Doc/library/xmlrpc.client.rst
+++ b/Doc/library/xmlrpc.client.rst
@@@ -27,7 -27,7 +27,7 @@@ between conformable Python objects and 
     constructed data.  If you need to parse untrusted or unauthenticated data see
     :ref:`xml-vulnerabilities`.
  
--.. versionchanged:: 3.4.3
++.. versionchanged:: 3.5
  
     For https URIs, :mod:`xmlrpc.client` now performs all the necessary
     certificate and hostname checks by default
@@@ -127,6 -129,9 +129,9 @@@
     :class:`Server` is retained as an alias for :class:`ServerProxy` for backwards
     compatibility.  New code should use :class:`ServerProxy`.
  
 -   .. versionchanged:: 3.4.3
++   .. versionchanged:: 3.5
+       Added the *context* argument.
+ 
  
  .. seealso::
  
diff --cc Misc/NEWS
index 86762f845211,924a8a205353..21769d83304c
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -191,12 -36,8 +191,14 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #22960: Add a context argument to xmlrpclib.ServerProxy constructor.
+ 
 +- Issue #22389: Add contextlib.redirect_stderr().
 +
 +- Issue #21356: Make ssl.RAND_egd() optional to support LibreSSL. The
 +  availability of the function is checked during the compilation. Patch written
 +  by Bernard Spil.
 +
  - Issue #22915: SAX parser now supports files opened with file descriptor or
    bytes path.