summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2014-06-07 13:22:06 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2014-06-07 13:22:06 (GMT)
commite2197a48053404fcfee1a84f002029654e3987d3 (patch)
tree4712037287510e2c3a73885e4743cf512ec976ac /Doc
parentf2d9526391e99b1877134215ea1382b7b02157eb (diff)
parent1462786f008671fb4ae85f8b9c7a4e54777ff13a (diff)
downloadcpython-e2197a48053404fcfee1a84f002029654e3987d3.zip
cpython-e2197a48053404fcfee1a84f002029654e3987d3.tar.gz
cpython-e2197a48053404fcfee1a84f002029654e3987d3.tar.bz2
Merge issue #21667 from 3.4
Diffstat (limited to 'Doc')
-rw-r--r--Doc/reference/datamodel.rst19
1 files changed, 10 insertions, 9 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 6ce575e..24f3f93 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -285,16 +285,17 @@ Sequences
single: integer
single: Unicode
- A string is a sequence of values that represent Unicode codepoints.
- All the codepoints in range ``U+0000 - U+10FFFF`` can be represented
- in a string. Python doesn't have a :c:type:`chr` type, and
- every character in the string is represented as a string object
- with length ``1``. The built-in function :func:`ord` converts a
- character to its codepoint (as an integer); :func:`chr` converts
- an integer in range ``0 - 10FFFF`` to the corresponding character.
+ A string is a sequence of values that represent Unicode code points.
+ All the code points in the range ``U+0000 - U+10FFFF`` can be
+ represented in a string. Python doesn't have a :c:type:`char` type;
+ instead, every code point in the string is represented as a string
+ object with length ``1``. The built-in function :func:`ord`
+ converts a code point from its string form to an integer in the
+ range ``0 - 10FFFF``; :func:`chr` converts an integer in the range
+ ``0 - 10FFFF`` to the corresponding length ``1`` string object.
:meth:`str.encode` can be used to convert a :class:`str` to
- :class:`bytes` using the given encoding, and :meth:`bytes.decode` can
- be used to achieve the opposite.
+ :class:`bytes` using the given text encoding, and
+ :meth:`bytes.decode` can be used to achieve the opposite.
Tuples
.. index::