From: Georg Brandl <georg@python.org>
Date: Sat, 8 Jan 2011 09:18:55 +0000 (+0000)
Subject: Merged revisions 86882 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~88
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d6fa47fb066ea314b8e5fd8bbcfb6dfaaac66ab;p=thirdparty%2FPython%2Fcpython.git

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.
........
---

diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
index 4771d447b713..b138f65a7e5c 100644
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -207,14 +207,14 @@ including: :mod:`zlib`, :mod:`gzip`, :mod:`bz2`, :mod:`zipfile` and
 :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