Merged revisions 70536 via svnmerge from

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

........
  r70536 | benjamin.peterson | 2009-03-22 21:49:51 -0500 (Sun, 22 Mar 2009) | 1 line

  more about the file type's death #5513
........

diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst
index fcdca0444dfb581d476b05025efdbbac5d1e17f9..ba9afe824815952fdc50fbe180f191108d3be290 100644 (file)
--- a/Doc/whatsnew/3.0.rst
+++ b/Doc/whatsnew/3.0.rst
@@ -813,7 +813,8 @@ Builtins
 * Removed :func:`execfile`.  Instead of ``execfile(fn)`` use
   ``exec(open(fn).read())``.
 
-* Removed :class:`file`.  Use :func:`open`.
+* Removed the :class:`file` type.  Use :func:`open`.  There are now several
+  different kinds of streams that open can return in the :mod:`io` module.
 
 * Removed :func:`reduce`.  Use :func:`functools.reduce` if you really
   need it; however, 99 percent of the time an explicit :keyword:`for`