#10050 : merge to default

orsenthil · orsenthil · commit 7f6d79721d58 · 2013-03-18T17:10:45.000-07:00
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
@@ -1306,6 +1306,8 @@ some point in the future.
 
 .. class:: URLopener(proxies=None, **x509)
 
+   .. deprecated:: 3.3
+
    Base class for opening and reading URLs.  Unless you need to support opening
    objects using schemes other than :file:`http:`, :file:`ftp:`, or :file:`file:`,
    you probably want to use :class:`FancyURLopener`.
@@ -1375,6 +1377,8 @@ some point in the future.
 
 .. class:: FancyURLopener(...)
 
+   .. deprecated:: 3.3
+
    :class:`FancyURLopener` subclasses :class:`URLopener` providing default handling
    for the following HTTP response codes: 301, 302, 303, 307 and 401.  For the 30x
    response codes listed above, the :mailheader:`Location` header is used to fetch
