Merged revisions 77020 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77020 | senthil.kumaran | 2009-12-24 07:54:37 +0530 (Thu, 24 Dec 2009) | 9 lines

  Merged revisions 77018 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r77018 | senthil.kumaran | 2009-12-24 07:48:14 +0530 (Thu, 24 Dec 2009) | 3 lines

    Fix for Issue7570: Error in urllib2 example.
  ........
................

Doc/library/urllib.request.rst

@@ -1116,10 +1116,10 @@ programmatically-supplied proxy URLs, and adds proxy authorization support with
 :class:`ProxyBasicAuthHandler`. ::
 
    proxy_handler = urllib.request.ProxyHandler({'http': 'http://www.example.com:3128/'})
-   proxy_auth_handler = urllib.request.HTTPBasicAuthHandler()
+   proxy_auth_handler = urllib.request.ProxyBasicAuthHandler()
    proxy_auth_handler.add_password('realm', 'host', 'username', 'password')
 
-   opener = build_opener(proxy_handler, proxy_auth_handler)
+   opener = urllib.request.build_opener(proxy_handler, proxy_auth_handler)
    # This time, rather than install the OpenerDirector, we use it directly:
    opener.open('http://www.example.com/login.html')