summaryrefslogtreecommitdiffstats
path: root/Doc/library/urllib.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-06-12 18:52:31 (GMT)
committerGeorg Brandl <georg@python.org>2008-06-12 18:52:31 (GMT)
commit83e9f4cd77f0cf4e47d505643c00b0dc3debace3 (patch)
tree5fe0608949044149b11903ad280c6032238e4832 /Doc/library/urllib.rst
parentb1549092ea5346e49eb6f0836857858a6bbd864c (diff)
downloadcpython-83e9f4cd77f0cf4e47d505643c00b0dc3debace3.zip
cpython-83e9f4cd77f0cf4e47d505643c00b0dc3debace3.tar.gz
cpython-83e9f4cd77f0cf4e47d505643c00b0dc3debace3.tar.bz2
Remove last traces of mimetools.
Diffstat (limited to 'Doc/library/urllib.rst')
-rw-r--r--Doc/library/urllib.rst12
1 files changed, 5 insertions, 7 deletions
diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst
index 646b048..3435e55 100644
--- a/Doc/library/urllib.rst
+++ b/Doc/library/urllib.rst
@@ -39,19 +39,17 @@ High-level interface
however, so it can't be used at those few places where a true built-in file
object is required.)
- .. index:: module: mimetools
-
The :meth:`info` method returns an instance of the class
- :class:`mimetools.Message` containing meta-information associated with the
- URL. When the method is HTTP, these headers are those returned by the server
- at the head of the retrieved HTML page (including Content-Length and
+ :class:`email.message.Message` containing meta-information associated with
+ the URL. When the method is HTTP, these headers are those returned by the
+ server at the head of the retrieved HTML page (including Content-Length and
Content-Type). When the method is FTP, a Content-Length header will be
present if (as is now usual) the server passed back a file length in response
to the FTP retrieval request. A Content-Type header will be present if the
MIME type can be guessed. When the method is local-file, returned headers
will include a Date representing the file's last-modified time, a
Content-Length giving file size, and a Content-Type containing a guess at the
- file's type. See also the description of the :mod:`mimetools` module.
+ file's type.
The :meth:`geturl` method returns the real URL of the page. In some cases, the
HTTP server redirects a client to another URL. The :func:`urlopen` function
@@ -288,7 +286,7 @@ URL Opener objects
Retrieves the contents of *url* and places it in *filename*. The return value
is a tuple consisting of a local filename and either a
- :class:`mimetools.Message` object containing the response headers (for remote
+ :class:`email.message.Message` object containing the response headers (for remote
URLs) or ``None`` (for local URLs). The caller must then open and read the
contents of *filename*. If *filename* is not given and the URL refers to a
local file, the input filename is returned. If the URL is non-local and