summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2010-04-18 23:03:16 (GMT)
committerRaymond Hettinger <python@rcn.com>2010-04-18 23:03:16 (GMT)
commitdbe961215a2cc9d9ef60aadabe9dc2fc94493e0d (patch)
treec75dad49a61eb44d31b7441350661ac619aaba95
parent4ec45df9a724d2405b516967bc390f7d064f466c (diff)
downloadcpython-dbe961215a2cc9d9ef60aadabe9dc2fc94493e0d.zip
cpython-dbe961215a2cc9d9ef60aadabe9dc2fc94493e0d.tar.gz
cpython-dbe961215a2cc9d9ef60aadabe9dc2fc94493e0d.tar.bz2
Issue 8436: set.__init__ accepts keyword args
-rw-r--r--Lib/test/test_set.py1
-rw-r--r--Objects/setobject.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py
index 2b43a16..3dde82f 100644
--- a/Lib/test/test_set.py
+++ b/Lib/test/test_set.py
@@ -49,6 +49,7 @@ class TestJointOps(unittest.TestCase):
def test_new_or_init(self):
self.assertRaises(TypeError, self.thetype, [], 2)
+ self.assertRaises(TypeError, set().__init__, a=1)
def test_uniquification(self):
actual = sorted(self.s)
diff --git a/Objects/setobject.c b/Objects/setobject.c
index d2a55fc..36afeb3 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -1978,6 +1978,8 @@ set_init(PySetObject *self, PyObject *args, PyObject *kwds)
if (!PyAnySet_Check(self))
return -1;
+ if (PySet_Check(self) && !_PyArg_NoKeywords("set()", kwds))
+ return -1;
if (!PyArg_UnpackTuple(args, Py_TYPE(self)->tp_name, 0, 1, &iterable))
return -1;
set_clear_internal(self);