diff options
| author | Guido van Rossum <guido@python.org> | 2008-03-18 03:15:05 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2008-03-18 03:15:05 (GMT) |
| commit | 20bda581e3f95a8fa9057a7d63f09d00b4e425cc (patch) | |
| tree | 3d821701e4fa2bc2f37abe9369f4a255451d9874 /Python | |
| parent | 04edb528ca39d25a019e7b391a3b5a69156848fe (diff) | |
| download | cpython-20bda581e3f95a8fa9057a7d63f09d00b4e425cc.zip cpython-20bda581e3f95a8fa9057a7d63f09d00b4e425cc.tar.gz cpython-20bda581e3f95a8fa9057a7d63f09d00b4e425cc.tar.bz2 | |
Clean up the Py3k warnings for non-BaseException-subclasses a bit. We
now don't warn for some corner cases that deserve a warning, rather
than warning double or incorrectly for some other corner cases.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 72da263..d66d97e 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -4086,8 +4086,9 @@ cmp_outcome(int op, register PyObject *v, register PyObject *w) if (ret_val == -1) return NULL; } - if (Py_Py3kWarningFlag && - !Py3kExceptionClass_Check(exc)) + else if (Py_Py3kWarningFlag && + !PyTuple_Check(exc) && + !Py3kExceptionClass_Check(exc)) { int ret_val; ret_val = PyErr_WarnEx( @@ -4108,8 +4109,9 @@ cmp_outcome(int op, register PyObject *v, register PyObject *w) if (ret_val == -1) return NULL; } - if (Py_Py3kWarningFlag && - !Py3kExceptionClass_Check(w)) + else if (Py_Py3kWarningFlag && + !PyTuple_Check(w) && + !Py3kExceptionClass_Check(w)) { int ret_val; ret_val = PyErr_WarnEx( |