[Python-checkins] cpython (merge 3.4 -> default): Merge from 3.4

[andrew.kuchling]

http://hg.python.org/cpython/rev/9fc4a1ebe652
changeset:   90458:9fc4a1ebe652
parent:      90455:c8d8a6cc5586
parent:      90457:e33a036fd784
user:        Andrew Kuchling <amk at amk.ca>
date:        Fri Apr 25 09:35:26 2014 -0400
summary:
  Merge from 3.4

files:
  Lib/io.py |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Lib/io.py b/Lib/io.py
--- a/Lib/io.py
+++ b/Lib/io.py
@@ -70,16 +70,16 @@
 # Method descriptions and default implementations are inherited from the C
 # version however.
 class IOBase(_io._IOBase, metaclass=abc.ABCMeta):
-    pass
+    __doc__ = _io._IOBase.__doc__
 
 class RawIOBase(_io._RawIOBase, IOBase):
-    pass
+    __doc__ = _io._RawIOBase.__doc__
 
 class BufferedIOBase(_io._BufferedIOBase, IOBase):
-    pass
+    __doc__ = _io._BufferedIOBase.__doc__
 
 class TextIOBase(_io._TextIOBase, IOBase):
-    pass
+    __doc__ = _io._TextIOBase.__doc__
 
 RawIOBase.register(FileIO)
 

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