[Python-checkins] r78885 - in python/branches/release31-maint: Doc/library/bz2.rst

Fri Mar 12 23:48:16 CET 2010

Author: ezio.melotti
Date: Fri Mar 12 23:48:16 2010
New Revision: 78885
Log:
Merged revisions 78884 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
 r78884 | ezio.melotti | 2010年03月13日 00:45:38 +0200 (2010年3月13日) | 1 line
 
 #8057: fix strings -> byte strings
........
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Doc/library/bz2.rst
Modified: python/branches/release31-maint/Doc/library/bz2.rst
==============================================================================

--- python/branches/release31-maint/Doc/library/bz2.rst	(original)
+++ python/branches/release31-maint/Doc/library/bz2.rst	Fri Mar 12 23:48:16 2010
@@ -73,15 +73,16 @@
 
 .. method:: read([size])
 
- Read at most *size* uncompressed bytes, returned as a string. If the
+ Read at most *size* uncompressed bytes, returned as a byte string. If the
 *size* argument is negative or omitted, read until EOF is reached.
 
 
 .. method:: readline([size])
 
- Return the next line from the file, as a string, retaining newline. A
- non-negative *size* argument limits the maximum number of bytes to return
- (an incomplete line may be returned then). Return an empty string at EOF.
+ Return the next line from the file, as a byte string, retaining newline.
+ A non-negative *size* argument limits the maximum number of bytes to
+ return (an incomplete line may be returned then). Return an empty byte
+ string at EOF.
 
 
 .. method:: readlines([size])
@@ -111,15 +112,16 @@
 
 .. method:: write(data)
 
- Write string *data* to file. Note that due to buffering, :meth:`close` may
- be needed before the file on disk reflects the data written.
+ Write the byte string *data* to file. Note that due to buffering,
+ :meth:`close` may be needed before the file on disk reflects the data
+ written.
 
 
- .. method:: writelines(sequence_of_strings)
+ .. method:: writelines(sequence_of_byte_strings)
 
- Write the sequence of strings to the file. Note that newlines are not
- added. The sequence can be any iterable object producing strings. This is
- equivalent to calling write() for each string.
+ Write the sequence of byte strings to the file. Note that newlines are not
+ added. The sequence can be any iterable object producing byte strings.
+ This is equivalent to calling write() for each byte string.
 
 
 Sequential (de)compression
