[Python-checkins] cpython (merge 3.3 -> 3.3): Automated merge with file:///Users/skumaran/python/cpython

Wed Mar 20 05:25:05 CET 2013

http://hg.python.org/cpython/rev/e1fdda86e937
changeset: 82825:e1fdda86e937
branch: 3.3
parent: 82818:fde60d3f542e
parent: 82822:d805cfa523ec
user: Senthil Kumaran <senthil at uthcode.com>
date: Tue Mar 19 21:27:23 2013 -0700
summary:
 Automated merge with file:///Users/skumaran/python/cpython
files:
 Doc/library/urllib.request.rst | 16 ++++++++--------
 1 files changed, 8 insertions(+), 8 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
@@ -478,7 +478,7 @@
 request to be ``POST`` rather than ``GET``. Deprecated in 3.3, use
 :attr:`Request.data`.
 
- .. deprecated:: 3.3
+ .. deprecated-removed:: 3.3 3.4
 
 
 .. method:: Request.has_data()
@@ -486,14 +486,14 @@
 Return whether the instance has a non-\ ``None`` data. Deprecated in 3.3,
 use :attr:`Request.data`.
 
- .. deprecated:: 3.3
+ .. deprecated-removed:: 3.3 3.4
 
 
 .. method:: Request.get_data()
 
 Return the instance's data. Deprecated in 3.3, use :attr:`Request.data`.
 
- .. deprecated:: 3.3
+ .. deprecated-removed:: 3.3 3.4
 
 
 .. method:: Request.get_type()
@@ -501,7 +501,7 @@
 Return the type of the URL --- also known as the scheme. Deprecated in 3.3,
 use :attr:`Request.type`.
 
- .. deprecated:: 3.3
+ .. deprecated-removed:: 3.3 3.4
 
 
 .. method:: Request.get_host()
@@ -509,7 +509,7 @@
 Return the host to which a connection will be made. Deprecated in 3.3, use
 :attr:`Request.host`.
 
- .. deprecated:: 3.3
+ .. deprecated-removed:: 3.3 3.4
 
 
 .. method:: Request.get_selector()
@@ -517,7 +517,7 @@
 Return the selector --- the part of the URL that is sent to the server.
 Deprecated in 3.3, use :attr:`Request.selector`.
 
- .. deprecated:: 3.3
+ .. deprecated-removed:: 3.3 3.4
 
 .. method:: Request.get_header(header_name, default=None)
 
@@ -538,7 +538,7 @@
 :rfc:`2965`. See the documentation for the :class:`Request` constructor.
 Deprecated in 3.3, use :attr:`Request.origin_req_host`.
 
- .. deprecated:: 3.3
+ .. deprecated-removed:: 3.3 3.4
 
 
 .. method:: Request.is_unverifiable()
@@ -547,7 +547,7 @@
 documentation for the :class:`Request` constructor. Deprecated in 3.3, use
 :attr:`Request.unverifiable`.
 
- .. deprecated:: 3.3
+ .. deprecated-removed:: 3.3 3.4
 
 
 .. _opener-director-objects:
-- 
Repository URL: http://hg.python.org/cpython
