summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-02-27 13:16:55 -0800
committerTim Graham <timograham@gmail.com>2013-02-27 13:16:55 -0800
commit226a9fb2ea417dacbd01c95dd5283c9478e0abf6 (patch)
tree9955f474f53c35544b8bf5d8f3f805bd7ab99a1e /docs
parentb0ba21db0721a9dbc6b98e1760fad64c7c86ff91 (diff)
parentfba6df19b5d7076e6858b3bd773911a529d60b30 (diff)
Merge pull request #858 from intgr/py3kdoc-fix
Fixed a typo in Python 3 porting guide.
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/python3.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/topics/python3.txt b/docs/topics/python3.txt
index b1f3fa3277..2212a24131 100644
--- a/docs/topics/python3.txt
+++ b/docs/topics/python3.txt
@@ -238,7 +238,7 @@ under Python 3, use the :func:`str` builtin::
str('my string')
In Python 3, there aren't any automatic conversions between ``str`` and
-``bytes``, and the :mod:`codecs` module became more strict. :meth:`str.decode`
+``bytes``, and the :mod:`codecs` module became more strict. :meth:`str.encode`
always returns ``bytes``, and ``bytes.decode`` always returns ``str``. As a
consequence, the following pattern is sometimes necessary::