cpython: d914d681b7f3 (original) (raw)

Mercurial > cpython

changeset 101533:d914d681b7f3 2.7

Issue #26553: Capitalization of HTTP, HTTPS, FTP, and URL Patch by Anish Shah and Aatish Neupane. [#26553]

Martin Panter vadmium+py@gmail.com
date	Sat, 28 May 2016 02:33:05 +0000
parents	0df93ab07a8f
children	f66c30f66235
files	Doc/library/fl.rst Doc/library/ftplib.rst Doc/library/httplib.rst Doc/library/urllib.rst Doc/library/urllib2.rst Doc/library/urlparse.rst Doc/library/xmlrpclib.rst
diffstat	7 files changed, 11 insertions(+), 11 deletions(-)[+] [-] Doc/library/fl.rst 2 Doc/library/ftplib.rst 2 Doc/library/httplib.rst 2 Doc/library/urllib.rst 8 Doc/library/urllib2.rst 2 Doc/library/urlparse.rst 2 Doc/library/xmlrpclib.rst 4

line wrap: on

line diff

--- a/Doc/library/fl.rst +++ b/Doc/library/fl.rst @@ -17,7 +17,7 @@ single: Overmars, Mark This module provides an interface to the FORMS Library by Mark Overmars. The -source for the library can be retrieved by anonymous ftp from host +source for the library can be retrieved by anonymous FTP from host ftp.cs.ruu.nl, directory :file:SGI/FORMS. It was last tested with version 2.0b.

--- 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 :mod:urllib to +as mirroring other FTP servers. It is also used by the module :mod:urllib to handle URLs that use FTP. For more information on FTP (File Transfer Protocol), see Internet :rfc:959.

--- a/Doc/library/httplib.rst +++ b/Doc/library/httplib.rst @@ -27,7 +27,7 @@ uses it to handle URLs that use HTTP and .. seealso:: The Requests package <http://requests.readthedocs.org/>_

is recommended for a higher-level http client interface.

is recommended for a higher-level HTTP client interface.

.. note::

--- a/Doc/library/urllib.rst +++ b/Doc/library/urllib.rst @@ -27,7 +27,7 @@ reading, and no seek operations are avai .. seealso:: The Requests package <http://requests.readthedocs.org/>_

is recommended for a higher-level http client interface.

is recommended for a higher-level HTTP client interface.

.. warning:: When opening HTTPS URLs, it does not attempt to validate the server certificate. Use at your own risk @@ -118,7 +118,7 @@ High-level interface causes environmental proxy settings to be used as discussed above. For example::

 # Use http://www.someproxy.com:3128 for http proxying[](#l4.16)

 # Use http://www.someproxy.com:3128 for HTTP proxying[](#l4.17)
 proxies = {'http': 'http://www.someproxy.com:3128'}[](#l4.18)
 filehandle = urllib.urlopen(some_url, proxies=proxies)[](#l4.19)
 # Don't use any proxies[](#l4.20)

@@ -297,8 +297,8 @@ Utility functions .. note:: urllib also exposes certain utility functions like splittype, splithost and

others parsing url into various components. But it is recommended to use
:mod:urlparse for parsing urls rather than using these functions directly.

others parsing URL into various components. But it is recommended to use
:mod:urlparse for parsing URLs rather than using these functions directly. Python 3 does not expose these helper functions from :mod:urllib.parse module.

--- a/Doc/library/urllib2.rst +++ b/Doc/library/urllib2.rst @@ -21,7 +21,7 @@ redirections, cookies and more. .. seealso:: The Requests package <http://requests.readthedocs.org/>_

is recommended for a higher-level http client interface.

is recommended for a higher-level HTTP client interface.

The :mod:urllib2 module defines the following functions:

--- a/Doc/library/urlparse.rst +++ b/Doc/library/urlparse.rst @@ -290,7 +290,7 @@ The :mod:urlparse module defines the f Names (URNs) and Uniform Resource Locators (URLs). :rfc:2368 - The mailto URL scheme.

 Parsing requirements for mailto url schemes.[](#l6.7)

 Parsing requirements for mailto URL schemes.[](#l6.8)

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

--- a/Doc/library/xmlrpclib.rst +++ b/Doc/library/xmlrpclib.rst @@ -36,7 +36,7 @@ between conformable Python objects and X .. versionchanged:: 2.7.9

For https URIs, :mod:xmlrpclib now performs all the necessary certificate

For HTTPS URIs, :mod:xmlrpclib now performs all the necessary certificate and hostname checks by default.

.. class:: ServerProxy(uri[, transport[, encoding[, verbose[, allow_none[, use_datetime[, context]]]]]]) @@ -65,7 +65,7 @@ between conformable Python objects and X 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.