Merged revisions 86882 via svnmerge from

birkenfeld · birkenfeld · commit 6d6fa47fb066 · 2011-01-08T09:18:55.000Z
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
@@ -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
 

Original file line number	Diff line number	Diff line change
@@ -207,14 +207,14 @@ including: :mod:`zlib`, :mod:`gzip`, :mod:`bz2`, :mod:`zipfile` and
`207`	`207`	:mod:`tarfile`. ::
`208`	`208`
`209`	`209`	`>>> import zlib`
`210`		`- >>> s = 'witch which has which witches wrist watch'`
	`210`	`+ >>> s = b'witch which has which witches wrist watch'`
`211`	`211`	`>>> len(s)`
`212`	`212`	`41`
`213`	`213`	`>>> t = zlib.compress(s)`
`214`	`214`	`>>> len(t)`
`215`	`215`	`37`
`216`	`216`	`>>> zlib.decompress(t)`
`217`		`- 'witch which has which witches wrist watch'`
	`217`	`+ b'witch which has which witches wrist watch'`
`218`	`218`	`>>> zlib.crc32(s)`
`219`	`219`	`226805979`
`220`	`220`