summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Doc/library/http.client.rst23
-rw-r--r--Doc/library/urllib.request.rst55
-rw-r--r--Lib/test/test_urllib.py9
-rw-r--r--Lib/test/test_urllib_response.py4
-rw-r--r--Lib/urllib/request.py14
-rw-r--r--Lib/urllib/response.py4
-rw-r--r--Misc/NEWS.d/next/Documentation/2019-08-27-01-14-59.bpo-12707.Yj3_7_.rst1
7 files changed, 84 insertions, 26 deletions
diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst
index db26d56..a458ab7 100644
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -484,6 +484,14 @@ statement.
HTTP protocol version used by server. 10 for HTTP/1.0, 11 for HTTP/1.1.
+.. attribute:: HTTPResponse.url
+
+ URL of the resource retrieved, commonly used to determine if a redirect was followed.
+
+.. attribute:: HTTPResponse.headers
+
+ Headers of the response in the form of an :class:`email.message.EmailMessage` instance.
+
.. attribute:: HTTPResponse.status
Status code returned by server.
@@ -501,6 +509,21 @@ statement.
Is ``True`` if the stream is closed.
+.. method:: HTTPResponse.geturl()
+
+ .. deprecated:: 3.9
+ Deprecated in favor of :attr:`~HTTPResponse.url`.
+
+.. method:: HTTPResponse.info()
+
+ .. deprecated:: 3.9
+ Deprecated in favor of :attr:`~HTTPResponse.headers`.
+
+.. method:: HTTPResponse.getstatus()
+
+ .. deprecated:: 3.9
+ Deprecated in favor of :attr:`~HTTPResponse.status`.
+
Examples
--------
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index 448bc67..a903d60 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -55,16 +55,8 @@ The :mod:`urllib.request` module defines the following functions:
The *cadefault* parameter is ignored.
This function always returns an object which can work as a
- :term:`context manager` and has methods such as
-
- * :meth:`~urllib.response.addinfourl.geturl` --- return the URL of the resource retrieved,
- commonly used to determine if a redirect was followed
-
- * :meth:`~urllib.response.addinfourl.info` --- return the meta-information of the page, such as headers,
- in the form of an :func:`email.message_from_string` instance (see
- `Quick Reference to HTTP Headers <http://jkorpela.fi/http.html>`_)
-
- * :meth:`~urllib.response.addinfourl.getcode` -- return the HTTP status code of the response.
+ :term:`context manager` and has the properties *url*, *headers*, and *status*.
+ See :class:`urllib.response.addinfourl` for more detail on these properties.
For HTTP and HTTPS URLs, this function returns a
:class:`http.client.HTTPResponse` object slightly modified. In addition
@@ -1585,9 +1577,42 @@ some point in the future.
:synopsis: Response classes used by urllib.
The :mod:`urllib.response` module defines functions and classes which define a
-minimal file like interface, including ``read()`` and ``readline()``. The
-typical response object is an addinfourl instance, which defines an ``info()``
-method and that returns headers and a ``geturl()`` method that returns the url.
-Functions defined by this module are used internally by the
-:mod:`urllib.request` module.
+minimal file-like interface, including ``read()`` and ``readline()``.
+Functions defined by this module are used internally by the :mod:`urllib.request` module.
+The typical response object is a :class:`urllib.response.addinfourl` instance:
+
+.. class:: addinfourl
+
+ .. attribute:: url
+
+ URL of the resource retrieved, commonly used to determine if a redirect was followed.
+
+ .. attribute:: headers
+
+ Returns the headers of the response in the form of an :class:`~email.message.EmailMessage` instance.
+
+ .. attribute:: status
+
+ .. versionadded:: 3.9
+
+ Status code returned by server.
+
+ .. method:: geturl()
+
+ .. deprecated:: 3.9
+ Deprecated in favor of :attr:`~addinfourl.url`.
+
+ .. method:: info()
+
+ .. deprecated:: 3.9
+ Deprecated in favor of :attr:`~addinfourl.headers`.
+
+ .. attribute:: code
+
+ .. deprecated:: 3.9
+ Deprecated in favor of :attr:`~addinfourl.status`.
+
+ .. method:: getstatus()
+ .. deprecated:: 3.9
+ Deprecated in favor of :attr:`~addinfourl.status`.
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 8895421..9a6b5f6 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -194,6 +194,15 @@ class urlopen_FileTests(unittest.TestCase):
# by the tearDown() method for the test
self.returned_obj.close()
+ def test_headers(self):
+ self.assertIsInstance(self.returned_obj.headers, email.message.Message)
+
+ def test_url(self):
+ self.assertEqual(self.returned_obj.url, self.pathname)
+
+ def test_status(self):
+ self.assertIsNone(self.returned_obj.status)
+
def test_info(self):
self.assertIsInstance(self.returned_obj.info(), email.message.Message)
diff --git a/Lib/test/test_urllib_response.py b/Lib/test/test_urllib_response.py
index 0eb5942..73d2ef0 100644
--- a/Lib/test/test_urllib_response.py
+++ b/Lib/test/test_urllib_response.py
@@ -42,6 +42,7 @@ class TestResponse(unittest.TestCase):
def test_addinfo(self):
info = urllib.response.addinfo(self.fp, self.test_headers)
self.assertEqual(info.info(), self.test_headers)
+ self.assertEqual(info.headers, self.test_headers)
def test_addinfourl(self):
url = "http://www.python.org"
@@ -51,6 +52,9 @@ class TestResponse(unittest.TestCase):
self.assertEqual(infourl.info(), self.test_headers)
self.assertEqual(infourl.geturl(), url)
self.assertEqual(infourl.getcode(), code)
+ self.assertEqual(infourl.headers, self.test_headers)
+ self.assertEqual(infourl.url, url)
+ self.assertEqual(infourl.status, code)
def tearDown(self):
self.sock.close()
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index f6ce9cb..267a90d 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -163,18 +163,10 @@ def urlopen(url, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
The *cadefault* parameter is ignored.
- This function always returns an object which can work as a context
- manager and has methods such as
- * geturl() - return the URL of the resource retrieved, commonly used to
- determine if a redirect was followed
-
- * info() - return the meta-information of the page, such as headers, in the
- form of an email.message_from_string() instance (see Quick Reference to
- HTTP Headers)
-
- * getcode() - return the HTTP status code of the response. Raises URLError
- on errors.
+ This function always returns an object which can work as a
+ context manager and has the properties url, headers, and status.
+ See urllib.response.addinfourl for more detail on these properties.
For HTTP and HTTPS URLs, this function returns a http.client.HTTPResponse
object slightly modified. In addition to the three new methods above, the
diff --git a/Lib/urllib/response.py b/Lib/urllib/response.py
index 4778118..5a2c3cc 100644
--- a/Lib/urllib/response.py
+++ b/Lib/urllib/response.py
@@ -73,6 +73,10 @@ class addinfourl(addinfo):
self.url = url
self.code = code
+ @property
+ def status(self):
+ return self.code
+
def getcode(self):
return self.code
diff --git a/Misc/NEWS.d/next/Documentation/2019-08-27-01-14-59.bpo-12707.Yj3_7_.rst b/Misc/NEWS.d/next/Documentation/2019-08-27-01-14-59.bpo-12707.Yj3_7_.rst
new file mode 100644
index 0000000..423e831
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2019-08-27-01-14-59.bpo-12707.Yj3_7_.rst
@@ -0,0 +1 @@
+Deprecate info(), geturl(), getcode() methods in favor of the headers, url, and status properties, respectively, for HTTPResponse and addinfourl. Also deprecate the code attribute of addinfourl in favor of the status attribute. Patch by Ashwin Ramaswami \ No newline at end of file
generated by cgit v0.12 at 2025-01-12 11:48:52 (GMT)