[Python-checkins] cpython (merge 3.2 -> default): merge from 3.2

[senthil.kumaran]

http://hg.python.org/cpython/rev/b061265bb0e0
changeset:   70878:b061265bb0e0
parent:      70875:7d3fbce32e07
parent:      70877:18f3239b3d48
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sun Jun 19 13:56:56 2011 -0700
summary:
  merge from 3.2

files:
  Doc/library/urllib.parse.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst
--- a/Doc/library/urllib.parse.rst
+++ b/Doc/library/urllib.parse.rst
@@ -61,7 +61,7 @@
    input is presumed to be a relative URL and thus to start with
    a path component.
 
-       >>> from urlparse import urlparse
+       >>> from urllib.parse import urlparse
        >>> urlparse('//www.cwi.nl:80/%7Eguido/Python.html')
        ParseResult(scheme='', netloc='www.cwi.nl:80', path='/%7Eguido/Python.html',
                   params='', query='', fragment='')
@@ -537,7 +537,7 @@
 .. seealso::
 
    :rfc:`3986` - Uniform Resource Identifiers
-      This is the current standard (STD66). Any changes to urlparse module
+      This is the current standard (STD66). Any changes to urllib.parse module
       should conform to this. Certain deviations could be observed, which are
       mostly for backward compatibility purposes and for certain de-facto
       parsing requirements as commonly observed in major browsers.

-- 
Repository URL: http://hg.python.org/cpython