diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2013-05-23 12:28:34 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2013-05-23 12:28:34 (GMT) |
| commit | cbc77bbbc0d0cbdb50889f556b9a514870481314 (patch) | |
| tree | 2e5c9c5149afe2f8d03c18013449590a16dc20a4 | |
| parent | c633f97808439d4bc7653891bfbd9a5d4db571e6 (diff) | |
| parent | 05ec6aca3a73772f16128628e8c3786b3e0cc4e6 (diff) | |
| download | cpython-cbc77bbbc0d0cbdb50889f556b9a514870481314.zip cpython-cbc77bbbc0d0cbdb50889f556b9a514870481314.tar.gz cpython-cbc77bbbc0d0cbdb50889f556b9a514870481314.tar.bz2 | |
merge from 3.3
Fix #18007 : Document CookieJar.add_cookie_header request parameter changes in 3.3 and 3.4.
| -rw-r--r-- | Doc/library/http.cookiejar.rst | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/Doc/library/http.cookiejar.rst b/Doc/library/http.cookiejar.rst index 40f24f2..34bfa87 100644 --- a/Doc/library/http.cookiejar.rst +++ b/Doc/library/http.cookiejar.rst @@ -154,9 +154,15 @@ contained :class:`Cookie` objects. The *request* object (usually a :class:`urllib.request..Request` instance) must support the methods :meth:`get_full_url`, :meth:`get_host`, - :meth:`get_type`, :meth:`unverifiable`, :meth:`get_origin_req_host`, - :meth:`has_header`, :meth:`get_header`, :meth:`header_items`, and - :meth:`add_unredirected_header`, as documented by :mod:`urllib.request`. + :meth:`get_type`, :meth:`unverifiable`, :meth:`has_header`, + :meth:`get_header`, :meth:`header_items`, :meth:`add_unredirected_header` + and :attr:`origin_req_host` attribute as documented by + :mod:`urllib.request`. + + .. versionchanged:: 3.3 + + *request* object needs :attr:`origin_req_host` attribute. Dependency on a + deprecated method :meth:`get_origin_req_host` has been removed. .. method:: CookieJar.extract_cookies(response, request) @@ -174,11 +180,15 @@ contained :class:`Cookie` objects. The *request* object (usually a :class:`urllib.request.Request` instance) must support the methods :meth:`get_full_url`, :meth:`get_host`, - :meth:`unverifiable`, and :meth:`get_origin_req_host`, as documented by - :mod:`urllib.request`. The request is used to set default values for + :meth:`unverifiable`, and :attr:`origin_req_host` attribute, as documented + by :mod:`urllib.request`. The request is used to set default values for cookie-attributes as well as for checking that the cookie is allowed to be set. + .. versionchanged:: 3.3 + + *request* object needs :attr:`origin_req_host` attribute. Dependency on a + deprecated method :meth:`get_origin_req_host` has been removed. .. method:: CookieJar.set_policy(policy) |