summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2013-03-20 04:27:23 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2013-03-20 04:27:23 (GMT)
commit620e875df20f9a62bad11f9e2ac249244be21875 (patch)
treea1328b7e875f2652fe454a25c8207bb2bc4bf989
parentdc32d18d1127112fcc9033cd9a065bf3457176ec (diff)
parentcd3bb8b73cf11db2d296b86b26c30f7bf2248283 (diff)
downloadcpython-620e875df20f9a62bad11f9e2ac249244be21875.zip
cpython-620e875df20f9a62bad11f9e2ac249244be21875.tar.gz
cpython-620e875df20f9a62bad11f9e2ac249244be21875.tar.bz2
Automated merge with file:///Users/skumaran/python/cpython
-rw-r--r--Doc/library/urllib.request.rst16
1 files changed, 8 insertions, 8 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index 3aaf2c2..c507084 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -478,7 +478,7 @@ request.
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 @@ request.
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 @@ request.
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 @@ request.
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 @@ request.
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 @@ request.
: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 @@ request.
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: