From fe289c0f6f2ecbc06a9aa4183304bb6db7c03f7b Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Sat, 28 May 2016 02:20:39 +0000 Subject: [PATCH] Issue #26553: Capitalization of HTTP, HTTPS, FTP, and URL Patch by Anish Shah and Aatish Neupane. --- Doc/library/concurrent.futures.rst | 2 +- Doc/library/ftplib.rst | 2 +- Doc/library/http.client.rst | 2 +- Doc/library/urllib.parse.rst | 2 +- Doc/library/urllib.request.rst | 14 +++++++------- Doc/library/xmlrpc.client.rst | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst index 15858be0be3..ae03f4b8f43 100644 --- a/Doc/library/concurrent.futures.rst +++ b/Doc/library/concurrent.futures.rst @@ -153,7 +153,7 @@ ThreadPoolExecutor Example 'http://www.bbc.co.uk/', 'http://some-made-up-domain.com/'] - # Retrieve a single page and report the url and contents + # Retrieve a single page and report the URL and contents def load_url(url, timeout): with urllib.request.urlopen(url, timeout=timeout) as conn: return conn.read() diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst index db435b1ba14..242d236dcd1 100644 --- a/Doc/library/ftplib.rst +++ b/Doc/library/ftplib.rst @@ -16,7 +16,7 @@ This module defines the class :class:`FTP` and a few related items. The :class:`FTP` class implements the client side of the FTP protocol. You can use this to write Python programs that perform a variety of automated FTP jobs, such -as mirroring other ftp servers. It is also used by the module +as mirroring other FTP servers. It is also used by the module :mod:`urllib.request` to handle URLs that use FTP. For more information on FTP (File Transfer Protocol), see Internet :rfc:`959`. diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst index bd91845b1dd..5a6a4a73fb4 100644 --- a/Doc/library/http.client.rst +++ b/Doc/library/http.client.rst @@ -22,7 +22,7 @@ HTTPS protocols. It is normally not used directly --- the module .. seealso:: The `Requests package `_ - is recommended for a higher-level http client interface. + is recommended for a higher-level HTTP client interface. .. note:: diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst index 21c82f52623..9eb0a93f3c6 100644 --- a/Doc/library/urllib.parse.rst +++ b/Doc/library/urllib.parse.rst @@ -582,7 +582,7 @@ task isn't already covered by the URL parsing functions above. Names (URNs) and Uniform Resource Locators (URLs). :rfc:`2368` - The mailto URL scheme. - Parsing requirements for mailto url schemes. + Parsing requirements for mailto URL schemes. :rfc:`1808` - Relative Uniform Resource Locators This Request For Comments includes the rules for joining an absolute and a diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index c9225cf9c5f..22cca99e519 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 `_ - 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. diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst index f66a23098db..c83ecae279d 100644 --- a/Doc/library/xmlrpc.client.rst +++ b/Doc/library/xmlrpc.client.rst @@ -29,7 +29,7 @@ between conformable Python objects and XML on the wire. .. versionchanged:: 3.5 - For https URIs, :mod:`xmlrpc.client` now performs all the necessary + For HTTPS URIs, :mod:`xmlrpc.client` now performs all the necessary certificate and hostname checks by default. .. class:: ServerProxy(uri, transport=None, encoding=None, verbose=False, \ @@ -67,7 +67,7 @@ between conformable Python objects and XML on the wire. portion will be base64-encoded as an HTTP 'Authorization' header, and sent to the remote server as part of the connection process when invoking an XML-RPC method. You only need to use this if the remote server requires a Basic - Authentication user and password. If an HTTPS url is provided, *context* may + Authentication user and password. If an HTTPS URL is provided, *context* may be :class:`ssl.SSLContext` and configures the SSL settings of the underlying HTTPS connection.