summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2008-07-11 00:16:30 (GMT)
committerBrett Cannon <bcannon@gmail.com>2008-07-11 00:16:30 (GMT)
commitf6afa334b92e1ed4ffdd54cde120f54b08492b54 (patch)
treefda3e87e808433ee7665133ec996cfd15277af6e /Doc
parent97aa1aeebd3dde08672b64026cdf2c5a610e7c0b (diff)
downloadcpython-f6afa334b92e1ed4ffdd54cde120f54b08492b54.zip
cpython-f6afa334b92e1ed4ffdd54cde120f54b08492b54.tar.gz
cpython-f6afa334b92e1ed4ffdd54cde120f54b08492b54.tar.bz2
Doc that urlparse is named urllib.parse in Python 3.0.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/urlparse.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/Doc/library/urlparse.rst b/Doc/library/urlparse.rst
index 0d83d77..02984f6 100644
--- 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"