diff options
author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-09-11 00:54:47 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-09-11 00:54:47 (GMT) |
commit | 1205f2774e00d38d3229a3a2742c2fcbc767bdde (patch) | |
tree | 8f5756aa974326bf503dfaad7512aff103bde9bb /Doc | |
parent | cd419abe42b42c626d91d5f839d53bdbde9852e0 (diff) | |
download | cpython-1205f2774e00d38d3229a3a2742c2fcbc767bdde.zip cpython-1205f2774e00d38d3229a3a2742c2fcbc767bdde.tar.gz cpython-1205f2774e00d38d3229a3a2742c2fcbc767bdde.tar.bz2 |
Issue #9738: PyUnicode_FromFormat() and PyErr_Format() raise an error on
a non-ASCII byte in the format string.
Document also the encoding.
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/c-api/exceptions.rst | 2 | ||||
-rw-r--r-- | Doc/c-api/unicode.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst index fcbd50b..f969b96 100644 --- a/Doc/c-api/exceptions.rst +++ b/Doc/c-api/exceptions.rst @@ -146,7 +146,7 @@ in various ways. There is a separate error indicator for each thread. .. cfunction:: PyObject* PyErr_Format(PyObject *exception, const char *format, ...) This function sets the error indicator and returns *NULL*. *exception* should be - a Python exception (class, not an instance). *format* should be a string, + a Python exception (class, not an instance). *format* should be an ASCII-encoded string, containing format codes, similar to :cfunc:`printf`. The ``width.precision`` before a format code is parsed, but the width part is ignored. diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst index a4ee03a..1b8402c 100644 --- a/Doc/c-api/unicode.rst +++ b/Doc/c-api/unicode.rst @@ -234,7 +234,7 @@ APIs: arguments, calculate the size of the resulting Python unicode string and return a string with the values formatted into it. The variable arguments must be C types and must correspond exactly to the format characters in the *format* - string. The following format characters are allowed: + ASCII-encoded string. The following format characters are allowed: .. % This should be exactly the same as the table in PyErr_Format. .. % The descriptions for %zd and %zu are wrong, but the truth is complicated |