[Python-3000-checkins] r54702 - python/branches/p3yk/Lib/io.py

guido.van.rossum python-3000-checkins at python.org
Fri Apr 6 20:11:48 CEST 2007


Author: guido.van.rossum
Date: Fri Apr  6 20:11:47 2007
New Revision: 54702

Modified:
   python/branches/p3yk/Lib/io.py
Log:
Get rid of duplicate definition of BufferedIOBase.


Modified: python/branches/p3yk/Lib/io.py
==============================================================================
--- python/branches/p3yk/Lib/io.py	(original)
+++ python/branches/p3yk/Lib/io.py	Fri Apr  6 20:11:47 2007
@@ -331,12 +331,7 @@
         return self._sock.fileno()
 
 
-class BufferedIOBase(RawIOBase):
-
-    """XXX Docstring."""
-
-
-class _MemoryBufferMixin:
+class _MemoryIOBase(RawIOBase):
 
     # XXX docstring
 
@@ -399,7 +394,7 @@
         return True
 
 
-class BytesIO(_MemoryBufferMixin, BufferedIOBase):
+class BytesIO(_MemoryIOBase):
 
     """Buffered I/O implementation using a bytes buffer, like StringIO."""
 
@@ -409,10 +404,10 @@
         buffer = b""
         if inital_bytes is not None:
             buffer += inital_bytes
-        _MemoryBufferMixin.__init__(self, buffer)
+        _MemoryIOBase.__init__(self, buffer)
 
 
-class StringIO(_MemoryBufferMixin, BufferedIOBase):
+class StringIO(_MemoryIOBase):
 
     """Buffered I/O implementation using a string buffer, like StringIO."""
 
@@ -425,7 +420,7 @@
         buffer = ""
         if inital_string is not None:
             buffer += inital_string
-        _MemoryBufferMixin.__init__(self, buffer)
+        _MemoryIOBase.__init__(self, buffer)
 
 
 class BufferedIOBase(RawIOBase):
@@ -441,8 +436,7 @@
 
     """Buffer for a readable sequential RawIO object.
 
-    Does not allow random access (seek, tell).  (Use BufferedRandom
-    for that.)
+    Does not allow random access (seek, tell).
     """
 
     def __init__(self, raw, buffer_size=DEFAULT_BUFFER_SIZE):


More information about the Python-3000-checkins mailing list