merge from 3.2

Doc/library/urllib.parse.rst

@@ -61,7 +61,7 @@ or on combining URL components into a URL string.
    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 @@ task isn't already covered by the URL parsing functions above.
 .. 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.