diff --git a/Doc/library/urllib2.rst b/Doc/library/urllib2.rst index ff664f5d4ce..6cab787dd9d 100644 --- a/Doc/library/urllib2.rst +++ b/Doc/library/urllib2.rst @@ -7,6 +7,13 @@ .. sectionauthor:: Moshe Zadka +.. note:: + The :mod:`urllib2` module has been split across several modules in + Python 3.0 named :mod:`urllib.request` and :mod:`urllib.error`. + The :term:`2to3` tool will automatically adapt imports when converting + your sources to 3.0. + + 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. diff --git a/Misc/NEWS b/Misc/NEWS index 638051f8f0a..8d83e6b76be 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -87,6 +87,16 @@ Build - Issue #3215: Build sqlite3 as sqlite3.dll, not sqlite3.pyd. +Documentation +------------- + +- Document that urllib2 is split across multiple modules and renamed in + Python 3.0. + +- Document that urllib is split across multiple modules and renamed in + Python 3.0. + + What's New in Python 2.6 beta 1? ================================