summaryrefslogtreecommitdiffstats
path: root/Doc/tutorial
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-01-08 09:18:55 (GMT)
committerGeorg Brandl <georg@python.org>2011-01-08 09:18:55 (GMT)
commit6d6fa47fb066ea314b8e5fd8bbcfb6dfaaac66ab (patch)
tree5e305411c0d96a42f0e2e97751100e1c9fc31124 /Doc/tutorial
parent875c2138064761f0fbe67c4a595dad01d437a6f3 (diff)
downloadcpython-6d6fa47fb066ea314b8e5fd8bbcfb6dfaaac66ab.zip
cpython-6d6fa47fb066ea314b8e5fd8bbcfb6dfaaac66ab.tar.gz
cpython-6d6fa47fb066ea314b8e5fd8bbcfb6dfaaac66ab.tar.bz2
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. ........
Diffstat (limited to 'Doc/tutorial')
-rw-r--r--Doc/tutorial/stdlib.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
index 4771d44..b138f65 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