[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

Tue Oct 28 21:39:21 CET 2014

https://hg.python.org/cpython/rev/0eec6943b3bd
changeset: 93191:0eec6943b3bd
parent: 93189:3037546ed4a7
parent: 93190:9141199800fe
user: Georg Brandl <georg at python.org>
date: Tue Oct 28 21:38:54 2014 +0100
summary:
 merge with 3.4
files:
 Doc/howto/cporting.rst | 7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Doc/howto/cporting.rst b/Doc/howto/cporting.rst
--- a/Doc/howto/cporting.rst
+++ b/Doc/howto/cporting.rst
@@ -43,10 +43,9 @@
 str/unicode Unification
 -----------------------
 
-
-Python 3's :func:`str` (``PyString_*`` functions in C) type is equivalent to
-Python 2's :func:`unicode` (``PyUnicode_*``). The old 8-bit string type has
-become :func:`bytes`. Python 2.6 and later provide a compatibility header,
+Python 3's :func:`str` type is equivalent to Python 2's :func:`unicode`; the C
+functions are called ``PyUnicode_*`` for both. The old 8-bit string type has become
+:func:`bytes`, with C functions called ``PyBytes_*``. Python 2.6 and later provide a compatibility header,
 :file:`bytesobject.h`, mapping ``PyBytes`` names to ``PyString`` ones. For best
 compatibility with Python 3, :c:type:`PyUnicode` should be used for textual data and
 :c:type:`PyBytes` for binary data. It's also important to remember that
-- 
Repository URL: https://hg.python.org/cpython
