Skip to content

Commit 93ca323

Browse files
committed
Issue #26553: Capitalization of HTTP, HTTPS, FTP, and URL
Patch by Anish Shah and Aatish Neupane.
1 parent f0c4275 commit 93ca323

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

Doc/library/concurrent.futures.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ ThreadPoolExecutor Example
153153
'http://www.bbc.co.uk/',
154154
'http://some-made-up-domain.com/']
155155

156-
# Retrieve a single page and report the url and contents
156+
# Retrieve a single page and report the URL and contents
157157
def load_url(http://github.com/url,%20timeout):
158158
with urllib.request.urlopen(url, timeout=timeout) as conn:
159159
return conn.read()

Doc/library/ftplib.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
This module defines the class :class:`FTP` and a few related items. The
1717
:class:`FTP` class implements the client side of the FTP protocol. You can use
1818
this to write Python programs that perform a variety of automated FTP jobs, such
19-
as mirroring other ftp servers. It is also used by the module
19+
as mirroring other FTP servers. It is also used by the module
2020
:mod:`urllib.request` to handle URLs that use FTP. For more information on FTP
2121
(File Transfer Protocol), see Internet :rfc:`959`.
2222

Doc/library/http.client.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ HTTPS protocols. It is normally not used directly --- the module
2222
.. seealso::
2323

2424
The `Requests package <https://requests.readthedocs.org/>`_
25-
is recommended for a higher-level http client interface.
25+
is recommended for a higher-level HTTP client interface.
2626

2727
.. note::
2828

Doc/library/urllib.parse.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ task isn't already covered by the URL parsing functions above.
582582
Names (URNs) and Uniform Resource Locators (URLs).
583583

584584
:rfc:`2368` - The mailto URL scheme.
585-
Parsing requirements for mailto url schemes.
585+
Parsing requirements for mailto URL schemes.
586586

587587
:rfc:`1808` - Relative Uniform Resource Locators
588588
This Request For Comments includes the rules for joining an absolute and a

Doc/library/urllib.request.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ authentication, redirections, cookies and more.
1515
.. seealso::
1616

1717
The `Requests package <https://requests.readthedocs.org/>`_
18-
is recommended for a higher-level http client interface.
18+
is recommended for a higher-level HTTP client interface.
1919

2020

2121
The :mod:`urllib.request` module defines the following functions:
@@ -71,15 +71,15 @@ The :mod:`urllib.request` module defines the following functions:
7171

7272
* :meth:`~urllib.response.addinfourl.getcode` -- return the HTTP status code of the response.
7373

74-
For http and https urls, this function returns a
74+
For HTTP and HTTPS URLs, this function returns a
7575
:class:`http.client.HTTPResponse` object slightly modified. In addition
7676
to the three new methods above, the msg attribute contains the
7777
same information as the :attr:`~http.client.HTTPResponse.reason`
7878
attribute --- the reason phrase returned by server --- instead of
7979
the response headers as it is specified in the documentation for
8080
:class:`~http.client.HTTPResponse`.
8181

82-
For ftp, file, and data urls and requests explicitly handled by legacy
82+
For FTP, file, and data URLs and requests explicitly handled by legacy
8383
:class:`URLopener` and :class:`FancyURLopener` classes, this function
8484
returns a :class:`urllib.response.addinfourl` object.
8585

@@ -453,7 +453,7 @@ request.
453453
.. attribute:: Request.selector
454454

455455
The URI path. If the :class:`Request` uses a proxy, then selector
456-
will be the full url that is passed to the proxy.
456+
will be the full URL that is passed to the proxy.
457457

458458
.. attribute:: Request.data
459459

@@ -772,8 +772,8 @@ HTTPRedirectHandler Objects
772772
details of the precise meanings of the various redirection codes.
773773

774774
An :class:`HTTPError` exception raised as a security consideration if the
775-
HTTPRedirectHandler is presented with a redirected url which is not an HTTP,
776-
HTTPS or FTP url.
775+
HTTPRedirectHandler is presented with a redirected URL which is not an HTTP,
776+
HTTPS or FTP URL.
777777

778778

779779
.. method:: HTTPRedirectHandler.redirect_request(req, fp, code, msg, hdrs, newurl)
@@ -1126,7 +1126,7 @@ it. ::
11261126

11271127
Note that urlopen returns a bytes object. This is because there is no way
11281128
for urlopen to automatically determine the encoding of the byte stream
1129-
it receives from the http server. In general, a program will decode
1129+
it receives from the HTTP server. In general, a program will decode
11301130
the returned bytes object to string once it determines or guesses
11311131
the appropriate encoding.
11321132

Doc/library/xmlrpc.client.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ between conformable Python objects and XML on the wire.
2929

3030
.. versionchanged:: 3.5
3131

32-
For https URIs, :mod:`xmlrpc.client` now performs all the necessary
32+
For HTTPS URIs, :mod:`xmlrpc.client` now performs all the necessary
3333
certificate and hostname checks by default.
3434

3535
.. class:: ServerProxy(uri, transport=None, encoding=None, verbose=False, \
@@ -67,7 +67,7 @@ between conformable Python objects and XML on the wire.
6767
portion will be base64-encoded as an HTTP 'Authorization' header, and sent to
6868
the remote server as part of the connection process when invoking an XML-RPC
6969
method. You only need to use this if the remote server requires a Basic
70-
Authentication user and password. If an HTTPS url is provided, *context* may
70+
Authentication user and password. If an HTTPS URL is provided, *context* may
7171
be :class:`ssl.SSLContext` and configures the SSL settings of the underlying
7272
HTTPS connection.
7373

0 commit comments

Comments
 (0)