Commit 57204931 authored by Martin Panter's avatar Martin Panter

Issue #26553: Capitalization of HTTP, HTTPS, FTP, and URL

Patch by Anish Shah and Aatish Neupane.
parent 6ecfab85
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
single: Overmars, Mark single: Overmars, Mark
This module provides an interface to the FORMS Library by Mark Overmars. The 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 ``ftp.cs.ruu.nl``, directory :file:`SGI/FORMS`. It was last tested with version
2.0b. 2.0b.
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
This module defines the class :class:`FTP` and a few related items. The 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 :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 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), handle URLs that use FTP. For more information on FTP (File Transfer Protocol),
see Internet :rfc:`959`. see Internet :rfc:`959`.
......
...@@ -27,7 +27,7 @@ uses it to handle URLs that use HTTP and HTTPS. ...@@ -27,7 +27,7 @@ uses it to handle URLs that use HTTP and HTTPS.
.. seealso:: .. seealso::
The `Requests package <http://requests.readthedocs.org/>`_ 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:: .. note::
......
...@@ -27,7 +27,7 @@ reading, and no seek operations are available. ...@@ -27,7 +27,7 @@ reading, and no seek operations are available.
.. seealso:: .. seealso::
The `Requests package <http://requests.readthedocs.org/>`_ 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 .. warning:: When opening HTTPS URLs, it does not attempt to validate the
server certificate. Use at your own risk! server certificate. Use at your own risk!
...@@ -118,7 +118,7 @@ High-level interface ...@@ -118,7 +118,7 @@ High-level interface
causes environmental proxy settings to be used as discussed above. For causes environmental proxy settings to be used as discussed above. For
example:: example::
# Use http://www.someproxy.com:3128 for http proxying # Use http://www.someproxy.com:3128 for HTTP proxying
proxies = {'http': 'http://www.someproxy.com:3128'} proxies = {'http': 'http://www.someproxy.com:3128'}
filehandle = urllib.urlopen(some_url, proxies=proxies) filehandle = urllib.urlopen(some_url, proxies=proxies)
# Don't use any proxies # Don't use any proxies
...@@ -297,8 +297,8 @@ Utility functions ...@@ -297,8 +297,8 @@ Utility functions
.. note:: .. note::
urllib also exposes certain utility functions like splittype, splithost and urllib also exposes certain utility functions like splittype, splithost and
others parsing url into various components. But it is recommended to use others parsing URL into various components. But it is recommended to use
:mod:`urlparse` for parsing urls rather than using these functions directly. :mod:`urlparse` for parsing URLs rather than using these functions directly.
Python 3 does not expose these helper functions from :mod:`urllib.parse` Python 3 does not expose these helper functions from :mod:`urllib.parse`
module. module.
......
...@@ -21,7 +21,7 @@ redirections, cookies and more. ...@@ -21,7 +21,7 @@ redirections, cookies and more.
.. seealso:: .. seealso::
The `Requests package <http://requests.readthedocs.org/>`_ 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: The :mod:`urllib2` module defines the following functions:
......
...@@ -290,7 +290,7 @@ The :mod:`urlparse` module defines the following functions: ...@@ -290,7 +290,7 @@ The :mod:`urlparse` module defines the following functions:
Names (URNs) and Uniform Resource Locators (URLs). Names (URNs) and Uniform Resource Locators (URLs).
:rfc:`2368` - The mailto URL scheme. :rfc:`2368` - The mailto URL scheme.
Parsing requirements for mailto url schemes. Parsing requirements for mailto URL schemes.
:rfc:`1808` - Relative Uniform Resource Locators :rfc:`1808` - Relative Uniform Resource Locators
This Request For Comments includes the rules for joining an absolute and a This Request For Comments includes the rules for joining an absolute and a
......
...@@ -36,7 +36,7 @@ between conformable Python objects and XML on the wire. ...@@ -36,7 +36,7 @@ between conformable Python objects and XML on the wire.
.. versionchanged:: 2.7.9 .. 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. and hostname checks by default.
.. class:: ServerProxy(uri[, transport[, encoding[, verbose[, allow_none[, use_datetime[, context]]]]]]) .. class:: ServerProxy(uri[, transport[, encoding[, verbose[, allow_none[, use_datetime[, context]]]]]])
...@@ -65,7 +65,7 @@ between conformable Python objects and XML on the wire. ...@@ -65,7 +65,7 @@ between conformable Python objects and XML on the wire.
portion will be base64-encoded as an HTTP 'Authorization' header, and sent to 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 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 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 be :class:`ssl.SSLContext` and configures the SSL settings of the underlying
HTTPS connection. HTTPS connection.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment