#2358: add py3k warning to sys.exc_clear().
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 2b54ee1..aaa1623 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -94,6 +94,11 @@
with catch_warning() as w:
self.assertWarning(sorted(lst, cmp), w, expected)
+ def test_sys_exc_clear(self):
+ expected = 'sys.exc_clear() not supported in 3.x. Use except clauses.'
+ with catch_warning() as w:
+ self.assertWarning(sys.exc_clear(), w, expected)
+
def test_main():
run_unittest(TestPy3KWarnings)
diff --git a/Misc/NEWS b/Misc/NEWS
index 7040936..a581247 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -11,6 +11,8 @@
Core and builtins
-----------------
+
+- Issue #2358: Add a Py3k warning on sys.exc_clear() usage.
- Issue #2400: Allow relative imports to "import *".
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 8e27844..385969f 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -169,8 +169,16 @@
static PyObject *
sys_exc_clear(PyObject *self, PyObject *noargs)
{
- PyThreadState *tstate = PyThreadState_GET();
+ PyThreadState *tstate;
PyObject *tmp_type, *tmp_value, *tmp_tb;
+
+ if (Py_Py3kWarningFlag &&
+ PyErr_Warn(PyExc_DeprecationWarning,
+ "sys.exc_clear() not supported in 3.x. "
+ "Use except clauses.") < 0)
+ return NULL;
+
+ tstate = PyThreadState_GET();
tmp_type = tstate->exc_type;
tmp_value = tstate->exc_value;
tmp_tb = tstate->exc_traceback;