From 30630b955561eea6eaba1745db174a820cc28519 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Tue, 5 Oct 2010 18:45:00 +0000 Subject: [PATCH] Merged revisions 85232 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85232 | senthil.kumaran | 2010-10-06 00:05:41 +0530 (Wed, 06 Oct 2010) | 3 lines Remove the references of FTPS from the urllib Documentation. There is no support for it yet. ........ --- Doc/library/urllib2.rst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Doc/library/urllib2.rst b/Doc/library/urllib2.rst index b977c4da628..cef96a4648f 100644 --- a/Doc/library/urllib2.rst +++ b/Doc/library/urllib2.rst @@ -18,8 +18,6 @@ The :mod:`urllib2` module defines functions and classes which help in opening URLs (mostly HTTP) in a complex world --- basic and digest authentication, redirections, cookies and more. -.. warning:: When opening HTTPS (or FTPS) URLs, it is not attempted to - validate the server certificate. Use at your own risk! The :mod:`urllib2` module defines the following functions: @@ -28,6 +26,9 @@ The :mod:`urllib2` module defines the following functions: Open the URL *url*, which can be either a string or a :class:`Request` object. + .. warning:: + HTTPS requests do not do any verification of the server's certificate. + *data* may be a string specifying additional data to send to the server, or ``None`` if no such data is needed. Currently HTTP requests are the only ones that use *data*; the HTTP request will be a POST instead of a GET when the @@ -39,8 +40,8 @@ The :mod:`urllib2` module defines the following functions: The optional *timeout* parameter specifies a timeout in seconds for blocking operations like the connection attempt (if not specified, the global default - timeout setting will be used). This actually only works for HTTP, HTTPS, - FTP and FTPS connections. + timeout setting will be used). This actually only works for HTTP, HTTPS and + FTP connections. This function returns a file-like object with two additional methods: @@ -432,7 +433,7 @@ OpenerDirector Objects optional *timeout* parameter specifies a timeout in seconds for blocking operations like the connection attempt (if not specified, the global default timeout setting will be used). The timeout feature actually works only for - HTTP, HTTPS, FTP and FTPS connections). + HTTP, HTTPS and FTP connections). .. versionchanged:: 2.6 *timeout* was added.