From: Brett Cannon <bcannon@gmail.com>
Date: Fri, 11 Jul 2008 00:12:52 +0000 (+0000)
Subject: Document the fact that urllib2 spans multiple modules with new names in Python
X-Git-Tag: v2.6b2~75
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97aa1aeebd3dde08672b64026cdf2c5a610e7c0b;p=thirdparty%2FPython%2Fcpython.git

Document the fact that urllib2 spans multiple modules with new names in Python
3.0.
---

diff --git a/Doc/library/urllib2.rst b/Doc/library/urllib2.rst
index ff664f5d4cec..6cab787dd9dd 100644
--- a/Doc/library/urllib2.rst
+++ b/Doc/library/urllib2.rst
@@ -7,6 +7,13 @@
 .. sectionauthor:: Moshe Zadka <moshez@users.sourceforge.net>
 
 
+.. 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 638051f8f0af..8d83e6b76be6 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?
 ================================