[Python-Dev] [Python-checkins] r87504 - in python/branches/py3k: Doc/c-api/exceptions.rst Include/pyerrors.h Include/warnings.h (original) (raw)

R. David Murray rdmurray at bitdance.com
Tue Dec 28 05:07:40 CET 2010

On Mon, 27 Dec 2010 02:49:27 +0100, victor.stinner <python-checkins at python.org> wrote:

Author: victor.stinner Date: Mon Dec 27 02:49:26 2010 New Revision: 87504

Log: Issue #9738: Document encodings of error and warning functions Modified: python/branches/py3k/Doc/c-api/exceptions.rst python/branches/py3k/Include/pyerrors.h python/branches/py3k/Include/warnings.h Modified: python/branches/py3k/Doc/c-api/exceptions.rst ============================================================================== --- python/branches/py3k/Doc/c-api/exceptions.rst (original) +++ python/branches/py3k/Doc/c-api/exceptions.rst Mon Dec 27 02:49:26 2010 @@ -148,7 +148,8 @@ This function sets the error indicator and returns NULL. exception should be a Python exception class. The format and subsequent parameters help format the error message; they have the same meaning and - values as in :c:func:PyUnicodeFromFormat. + values as in :c:func:PyUnicodeFromFormat. format is an ASCII-encoding + string.

ASCII-encoded string, or ASCII encoding-string?

.. c:function:: int PyErrWarnFormat(PyObject *category, Pyssizet stacklevel, const char *format, ...)

Function similar to :c:func:PyErrWarnEx, but use - :c:func:PyUnicodeFromFormat to format the warning message. + :c:func:PyUnicodeFromFormat to format the warning message. format is + an ASCII-encoded string.

So, the former, I'd guess :)

-- R. David Murray www.bitdance.com

More information about the Python-Dev mailing list