summaryrefslogtreecommitdiffstats
path: root/Doc/library/urllib.request.rst
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-05-28 02:20:39 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-05-28 02:20:39 (GMT)
commitfe289c0f6f2ecbc06a9aa4183304bb6db7c03f7b (patch)
tree715a1df308b1103b7dc2e34db063fbe0870c3ef6 /Doc/library/urllib.request.rst
parent6bb91f3b6e51352f91bcf785d3f6fe160ed2cd85 (diff)
downloadcpython-fe289c0f6f2ecbc06a9aa4183304bb6db7c03f7b.zip
cpython-fe289c0f6f2ecbc06a9aa4183304bb6db7c03f7b.tar.gz
cpython-fe289c0f6f2ecbc06a9aa4183304bb6db7c03f7b.tar.bz2
Issue #26553: Capitalization of HTTP, HTTPS, FTP, and URL
Patch by Anish Shah and Aatish Neupane.
Diffstat (limited to 'Doc/library/urllib.request.rst')
-rw-r--r--Doc/library/urllib.request.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index c9225cf..22cca99 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -15,7 +15,7 @@ authentication, redirections, cookies and more.
.. seealso::
The `Requests package <https://requests.readthedocs.org/>`_
- is recommended for a higher-level http client interface.
+ is recommended for a higher-level HTTP client interface.
The :mod:`urllib.request` module defines the following functions:
@@ -71,7 +71,7 @@ The :mod:`urllib.request` module defines the following functions:
* :meth:`~urllib.response.addinfourl.getcode` -- return the HTTP status code of the response.
- For http and https urls, this function returns a
+ For HTTP and HTTPS URLs, this function returns a
:class:`http.client.HTTPResponse` object slightly modified. In addition
to the three new methods above, the msg attribute contains the
same information as the :attr:`~http.client.HTTPResponse.reason`
@@ -79,7 +79,7 @@ The :mod:`urllib.request` module defines the following functions:
the response headers as it is specified in the documentation for
:class:`~http.client.HTTPResponse`.
- For ftp, file, and data urls and requests explicitly handled by legacy
+ For FTP, file, and data URLs and requests explicitly handled by legacy
:class:`URLopener` and :class:`FancyURLopener` classes, this function
returns a :class:`urllib.response.addinfourl` object.
@@ -453,7 +453,7 @@ request.
.. attribute:: Request.selector
The URI path. If the :class:`Request` uses a proxy, then selector
- will be the full url that is passed to the proxy.
+ will be the full URL that is passed to the proxy.
.. attribute:: Request.data
@@ -772,8 +772,8 @@ HTTPRedirectHandler Objects
details of the precise meanings of the various redirection codes.
An :class:`HTTPError` exception raised as a security consideration if the
- HTTPRedirectHandler is presented with a redirected url which is not an HTTP,
- HTTPS or FTP url.
+ HTTPRedirectHandler is presented with a redirected URL which is not an HTTP,
+ HTTPS or FTP URL.
.. method:: HTTPRedirectHandler.redirect_request(req, fp, code, msg, hdrs, newurl)
@@ -1126,7 +1126,7 @@ it. ::
Note that urlopen returns a bytes object. This is because there is no way
for urlopen to automatically determine the encoding of the byte stream
-it receives from the http server. In general, a program will decode
+it receives from the HTTP server. In general, a program will decode
the returned bytes object to string once it determines or guesses
the appropriate encoding.