[Python-checkins] cpython (merge 3.3 -> default): #10050 : merge to default

Tue Mar 19 01:07:41 CET 2013

http://hg.python.org/cpython/rev/d4cbd9e2e1cb
changeset: 82742:d4cbd9e2e1cb
parent: 82739:f86d46a580d8
parent: 82741:ea76cfff5851
user: Senthil Kumaran <senthil at uthcode.com>
date: Mon Mar 18 17:10:45 2013 -0700
summary:
 #10050 : merge to default
files:
 Doc/library/urllib.request.rst | 4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -1306,6 +1306,8 @@
 
 .. 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 @@
 
 .. 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
-- 
Repository URL: http://hg.python.org/cpython
