diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-10-05 03:34:02 +0300 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-10-05 03:34:02 +0300 |
| commit | 080a2c087e5fa08c44ff121d74ea8ad9d4413c58 (patch) | |
| tree | f5bcece562167593f10ac72f539415f46d269d14 /Doc | |
| parent | b176203ddab0671fb937c488492f4a535a37c639 (diff) | |
| parent | e7f90375b175ed9e610a1de3b5c910f9271375ad (diff) | |
| download | cpython-git-080a2c087e5fa08c44ff121d74ea8ad9d4413c58.tar.gz | |
#16127: merge with 3.3.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/c-api/unicode.rst | 2 | ||||
| -rw-r--r-- | Doc/reference/lexical_analysis.rst | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst index 0f7d2bb4d1..2ac51dfcce 100644 --- a/Doc/c-api/unicode.rst +++ b/Doc/c-api/unicode.rst @@ -1083,8 +1083,6 @@ These are the UTF-32 codec APIs: After completion, *\*byteorder* is set to the current byte order at the end of input data. - In a narrow build codepoints outside the BMP will be decoded as surrogate pairs. - If *byteorder* is *NULL*, the codec starts in native order mode. Return *NULL* if an exception was raised by the codec. diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst index bab39f9d36..94f219b023 100644 --- a/Doc/reference/lexical_analysis.rst +++ b/Doc/reference/lexical_analysis.rst @@ -538,9 +538,7 @@ Notes: this escape sequence. Exactly four hex digits are required. (6) - Any Unicode character can be encoded this way, but characters outside the Basic - Multilingual Plane (BMP) will be encoded using a surrogate pair if Python is - compiled to use 16-bit code units (the default). Exactly eight hex digits + Any Unicode character can be encoded this way. Exactly eight hex digits are required. |