[Python-checkins] r87857 - in python/branches/release31-maint: Doc/tutorial/stdlib.rst

[georg.brandl]

Author: georg.brandl
Date: Sat Jan  8 10:18:55 2011
New Revision: 87857

Log:
Merged revisions 86882 via svnmerge from 
svn+ssh://svn.python.org/python/branches/py3k

........
  r86882 | georg.brandl | 2010-11-30 09:20:16 +0100 (Di, 30 Nov 2010) | 1 line
  
  Fix input type for zlib.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/tutorial/stdlib.rst

Modified: python/branches/release31-maint/Doc/tutorial/stdlib.rst
==============================================================================
--- python/branches/release31-maint/Doc/tutorial/stdlib.rst	(original)
+++ python/branches/release31-maint/Doc/tutorial/stdlib.rst	Sat Jan  8 10:18:55 2011
@@ -207,14 +207,14 @@
 :mod:`tarfile`. ::
 
    >>> import zlib
-   >>> s = 'witch which has which witches wrist watch'
+   >>> s = b'witch which has which witches wrist watch'
    >>> len(s)
    41
    >>> t = zlib.compress(s)
    >>> len(t)
    37
    >>> zlib.decompress(t)
-   'witch which has which witches wrist watch'
+   b'witch which has which witches wrist watch'
    >>> zlib.crc32(s)
    226805979