summaryrefslogtreecommitdiffstats
path: root/Doc/howto
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-10-29 07:17:08 (GMT)
committerGeorg Brandl <georg@python.org>2013-10-29 07:17:08 (GMT)
commit3a19a89eacdb10407c6d1dc59887d11faea7aa3e (patch)
treeb5c6316323c377fe9f5799d58463cb86be21b6a3 /Doc/howto
parentdd371b92c43a98d0df31cd36ed19cf0bb2f94143 (diff)
parent3d596fa90b3c862eb2c0fb67aaf42cf1237c3258 (diff)
downloadcpython-3a19a89eacdb10407c6d1dc59887d11faea7aa3e.zip
cpython-3a19a89eacdb10407c6d1dc59887d11faea7aa3e.tar.gz
cpython-3a19a89eacdb10407c6d1dc59887d11faea7aa3e.tar.bz2
merge with 3.3
Diffstat (limited to 'Doc/howto')
-rw-r--r--Doc/howto/unicode.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
index 2920aa1..9d48a78 100644
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -514,7 +514,7 @@ columns and can return Unicode values from an SQL query.
Unicode data is usually converted to a particular encoding before it gets
written to disk or sent over a socket. It's possible to do all the work
-yourself: open a file, read an 8-bit bytes object from it, and convert the string
+yourself: open a file, read an 8-bit bytes object from it, and convert the bytes
with ``bytes.decode(encoding)``. However, the manual approach is not recommended.
One problem is the multi-byte nature of encodings; one Unicode character can be