Doc that urlparse is named urllib.parse in Python 3.0.

diff --git a/Doc/library/urlparse.rst b/Doc/library/urlparse.rst
index 0d83d779df4f839f71e00db2467c2a5e3abab704..02984f66a9c9d41b0b3b5124cac5d9a8078c127f 100644 (file)
--- a/Doc/library/urlparse.rst
+++ b/Doc/library/urlparse.rst
@@ -12,6 +12,12 @@
    pair: URL; parsing
    pair: relative; URL
 
+.. note::
+   The :mod:`urlparse` module is renamed to :mod:`urllib.parse` in Python 3.0.
+   The :term:`2to3` tool will automatically adapt imports when converting
+   your sources to 3.0.
+
+
 This module defines a standard interface to break Uniform Resource Locator (URL)
 strings up in components (addressing scheme, network location, path etc.), to
 combine the components back into a URL string, and to convert a "relative URL"

diff --git a/Misc/NEWS b/Misc/NEWS
index 8d83e6b76be62b550bc506d8ee504d2972a2889e..d447b389a28527c505ead8984affc8d77f449905 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -90,6 +90,8 @@ Build
 Documentation
 -------------
 
+- Document that urlparse has been renamed to urllib.parse in Python 3.0.
+
 - Document that urllib2 is split across multiple modules and renamed in
   Python 3.0.