merge 3.4 (#21764)

benjaminp · benjaminp · commit 3a0b6aa59bbc · 2014-06-14T18:52:14.000-07:00
diff --git a/Doc/library/io.rst b/Doc/library/io.rst
@@ -353,6 +353,12 @@ I/O Base Classes
       is usual for each of the lines provided to have a line separator at the
       end.
 
+   .. method:: __del__()
+
+      Prepare for object destruction. :class:`IOBase` provides a default
+      implementation of this method that calls the instance's
+      :meth:`~IOBase.close` method.
+
 
 .. class:: RawIOBase
 
