New subject: [Python-checkins] r87504 - in python/branches/py3k: Doc/c-api/exceptions.rst Include/pyerrors.h Include/warnings.h

28 Dec 2010

On Mon, 27 Dec 2010 02:49:27 +0100, victor.stinner  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:`PyUnicode_FromFormat`.
+   values as in :c:func:`PyUnicode_FromFormat`. *format* is an ASCII-encoding
+   string.
ASCII-encoded string, or ASCII encoding-string?
...
.. c:function:: int PyErr_WarnFormat(PyObject *category, Py_ssize_t stack_level, const char *format, ...)
Function similar to :c:func:`PyErr_WarnEx`, but use
-   :c:func:`PyUnicode_FromFormat` to format the warning message.
+   :c:func:`PyUnicode_FromFormat` to format the warning message.  *format* is
+   an ASCII-encoded string.
So, the former, I'd guess :)

--
R. David Murray                                      www.bitdance.com

    

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

R. David Murray

Victor Stinner

"Martin v. Löwis"

Stefan Behnel

Victor Stinner

R. David Murray

tags

participants (4)