From 861089fc49e17bc3d192e01f19641d9e01e0fa03 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 30 May 2006 07:34:45 +0000 Subject: Disallow keyword args for exceptions. --- Lib/test/test_exceptions.py | 7 +++++++ Objects/exceptions.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py index b4a766e..20e76b9 100644 --- a/Lib/test/test_exceptions.py +++ b/Lib/test/test_exceptions.py @@ -296,3 +296,10 @@ for args in exceptionList: ( repr(e), checkArgName, repr(expected[checkArgName]), repr(getattr(e, checkArgName)) )) + +try: + BaseException(a=1) +except TypeErrror: + pass +else: + raise TestFailed("BaseException shouldn't take keyword args") diff --git a/Objects/exceptions.c b/Objects/exceptions.c index 16ba5e5..28fb0c1 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -32,6 +32,9 @@ BaseException_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { PyBaseExceptionObject *self; + if (!_PyArg_NoKeywords("BaseException", kwds)) + return NULL; + self = (PyBaseExceptionObject *)type->tp_alloc(type, 0); /* the dict is created on the fly in PyObject_GenericSetAttr */ self->message = self->dict = NULL; -- cgit v0.12