[Python-checkins] r56956 - in doctools/trunk/Doc-3k: c-api/exceptions.rst data/refcounts.dat library/warnings.rst

[skip.montanaro]

Author: skip.montanaro
Date: Sun Aug 12 13:45:05 2007
New Revision: 56956

Modified:
   doctools/trunk/Doc-3k/c-api/exceptions.rst
   doctools/trunk/Doc-3k/data/refcounts.dat
   doctools/trunk/Doc-3k/library/warnings.rst
Log:
PyErr_Warn is deprecated in 2.5 - goes away for 3.0

Modified: doctools/trunk/Doc-3k/c-api/exceptions.rst
==============================================================================
--- doctools/trunk/Doc-3k/c-api/exceptions.rst	(original)
+++ doctools/trunk/Doc-3k/c-api/exceptions.rst	Sun Aug 12 13:45:05 2007
@@ -319,16 +319,6 @@
    documentation.  There is no C API for warning control.
 
 
-.. cfunction:: int PyErr_Warn(PyObject *category, char *message)
-
-   Issue a warning message.  The *category* argument is a warning category (see
-   below) or *NULL*; the *message* argument is a message string.  The warning will
-   appear to be issued from the function calling :cfunc:`PyErr_Warn`, equivalent to
-   calling :cfunc:`PyErr_WarnEx` with a *stacklevel* of 1.
-
-   Deprecated; use :cfunc:`PyErr_WarnEx` instead.
-
-
 .. cfunction:: int PyErr_WarnExplicit(PyObject *category, const char *message, const char *filename, int lineno, const char *module, PyObject *registry)
 
    Issue a warning message with explicit control over all warning attributes.  This

Modified: doctools/trunk/Doc-3k/data/refcounts.dat
==============================================================================
--- doctools/trunk/Doc-3k/data/refcounts.dat	(original)
+++ doctools/trunk/Doc-3k/data/refcounts.dat	Sun Aug 12 13:45:05 2007
@@ -299,10 +299,6 @@
 PyErr_Format:char*:format::
 PyErr_Format::...::
 
-PyErr_Warn:int:::
-PyErr_Warn:PyObject*:category:0:
-PyErr_Warn:char*:message::
-
 PyErr_WarnEx:int:::
 PyErr_WarnEx:PyObject*:category:0:
 PyErr_WarnEx:const char*:message::

Modified: doctools/trunk/Doc-3k/library/warnings.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/warnings.rst	(original)
+++ doctools/trunk/Doc-3k/library/warnings.rst	Sun Aug 12 13:45:05 2007
@@ -16,7 +16,7 @@
 might want to issue a warning when a program uses an obsolete module.
 
 Python programmers issue warnings by calling the :func:`warn` function defined
-in this module.  (C programmers use :cfunc:`PyErr_Warn`; see
+in this module.  (C programmers use :cfunc:`PyErr_WarnEx`; see
 :ref:`exceptionhandling` for details).
 
 Warning messages are normally written to ``sys.stderr``, but their disposition