merge with 3.3

This commit is contained in:
Georg Brandl 2013-10-29 08:17:08 +01:00
commit 3a19a89eac
4 changed files with 6 additions and 6 deletions

View file

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