From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 2 Nov 2014 18:19:15 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~532
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=030dbb91a92096c0a7611f2e0c711035622b5669;p=python

merge 3.4
---

030dbb91a92096c0a7611f2e0c711035622b5669
diff --cc Doc/library/urllib.request.rst
index 07928eda2d,bd7340becd..9de8dd3801
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@@ -115,9 -115,9 +115,10 @@@ The :mod:`urllib.request` module define
     .. versionchanged:: 3.3
        *cadefault* was added.
  
 -   .. versionchanged:: 3.4.3
 +   .. versionchanged:: 3.5
        *context* was added.
  
++
  .. function:: install_opener(opener)
  
     Install an :class:`OpenerDirector` instance as the default global opener.