diff options
| author | Brett Cannon <bcannon@gmail.com> | 2008-07-02 01:57:08 +0000 |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2008-07-02 01:57:08 +0000 |
| commit | 8bb8fa5dd679d1f4086fac4d3181f0985c14006d (patch) | |
| tree | d42673a3deb34bb5c03202b979b766eb89bb20a2 /Doc/library/urllib.rst | |
| parent | aac51b8a69d65533f511f0483c797fcf6a6c696c (diff) | |
| download | cpython-git-8bb8fa5dd679d1f4086fac4d3181f0985c14006d.tar.gz | |
Handle urllib's renaming for Python 3.0:
* Deprecate urllib.urlopen() in favor of urllib2.urlopen() for 3.0.
* Update docs to mention split/rename of the module and deprecation of
urlopen().
Changes to lib2to3 are in a separate commit. Work is for issue #2885.
Diffstat (limited to 'Doc/library/urllib.rst')
| -rw-r--r-- | Doc/library/urllib.rst | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst index ae1828f2a0..15e0c7afb0 100644 --- a/Doc/library/urllib.rst +++ b/Doc/library/urllib.rst @@ -4,6 +4,13 @@ .. module:: urllib :synopsis: Open an arbitrary network resource by URL (requires sockets). +.. note:: + The :mod:`urllib` module has been split into parts and renamed in + Python 3.0 to :mod:`urllib.request`, :mod:`urllib.parse`, + and :mod:`urllib.error`. The :term:`2to3` tool will automatically adapt + imports when converting your sources to 3.0. + Also note that the :func:`urllib.urlopen` function has been removed in + Python 3.0 in favor of :func:`urllib2.urlopen`. .. index:: single: WWW @@ -116,6 +123,10 @@ High-level interface .. versionchanged:: 2.6 Added :meth:`getcode` to returned object and support for the :envvar:`no_proxy` environment variable. + + .. deprecated:: 2.6 + The :func:`urlopen` function has been removed in Python 3.0 in favor + of :func:`urllib2.urlopen`. .. function:: urlretrieve(url[, filename[, reporthook[, data]]]) |