From b457ddaff2094a0ec02176184beb74f600178ed4 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 2 May 2008 02:25:09 +0000 Subject: [PATCH] Fix a backwards-compatibility mistake where a new optional argument for warnings.showwarning() was being used. This broke pre-existing replacements for the function since they didn't support the extra argument. Closes issue 2705. --- Misc/NEWS | 4 +++- Python/_warnings.c | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 34bdb9dfe91..d94d6555cd6 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -40,7 +40,9 @@ Extension Modules - Issue #1631171: Re-implement the 'warnings' module in C (the original Python code has been kept as backup). This will allow for using the 'warning's machinery in such places as the parser where use of pure Python code is not - possible. + possible. Both the ``showarning()`` and ``formatwarning()`` gain an + optional 'line' argument which is not called by default for + backwards-compatibility reasons. Library ------- diff --git a/Python/_warnings.c b/Python/_warnings.c index 88afade15ba..8f575ca539d 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -382,9 +382,6 @@ warn_explicit(PyObject *category, PyObject *message, res = PyObject_CallFunctionObjArgs(show_fxn, message, category, filename, lineno_obj, - Py_None, - sourceline ? - sourceline: Py_None, NULL); Py_DECREF(show_fxn); Py_XDECREF(res);