[Python-checkins] cpython (merge 2.7 -> 2.7): Merge heads

[serhiy.storchaka]

http://hg.python.org/cpython/rev/3a7638baf511
changeset:   89102:3a7638baf511
branch:      2.7
parent:      89099:734da14489c1
parent:      89094:2ac7551986ba
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Mon Feb 10 19:27:06 2014 +0200
summary:
  Merge heads

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


diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst
--- a/Doc/library/urllib.rst
+++ b/Doc/library/urllib.rst
@@ -9,8 +9,9 @@
     Python 3 to :mod:`urllib.request`, :mod:`urllib.parse`,
     and :mod:`urllib.error`. The :term:`2to3` tool will automatically adapt
     imports when converting your sources to Python 3.
-    Also note that the :func:`urllib.urlopen` function has been removed in
-    Python 3 in favor of :func:`urllib2.urlopen`.
+    Also note that the :func:`urllib.request.urlopen` function in Python 3 is
+    equivalent to :func:`urllib2.urlopen` and that :func:`urllib.urlopen` has
+    been removed.
 
 .. index::
    single: WWW

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