[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

[georg.brandl]

https://hg.python.org/cpython/rev/e96a738cd0df
changeset:   92838:e96a738cd0df
parent:      92836:f73f98a72684
parent:      92837:554152c317b4
user:        Georg Brandl <georg at python.org>
date:        Mon Oct 06 12:58:36 2014 +0200
summary:
  merge with 3.4

files:
  Doc/c-api/exceptions.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
--- a/Doc/c-api/exceptions.rst
+++ b/Doc/c-api/exceptions.rst
@@ -282,7 +282,7 @@
 exception handling (for example, :c:func:`Py_DECREF` owned references and return
 an error value).
 
-.. c:function:: int PyErr_WarnEx(PyObject *category, char *message, int stack_level)
+.. c:function:: int PyErr_WarnEx(PyObject *category, const char *message, Py_ssize_t stack_level)
 
    Issue a warning message.  The *category* argument is a warning category (see
    below) or *NULL*; the *message* argument is an UTF-8 encoded string.  *stack_level* is a

-- 
Repository URL: https://hg.python.org/cpython