SF #1486663 -- Allow keyword args in subclasses of set() and frozenset().

rhettinger · rhettinger · commit 535989ecb68d · 2007-01-11T18:21:04.000Z
diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py
@@ -468,6 +468,16 @@ class SetSubclass(set):
 class TestSetSubclass(TestSet):
     thetype = SetSubclass
 
+class SetSubclassWithKeywordArgs(set):
+    def __init__(self, iterable=[], newarg=None):
+        set.__init__(self, iterable)
+
+class TestSetSubclassWithKeywordArgs(TestSet):
+    
+    def test_keywords_in_subclass(self):
+        'SF bug #1486663 -- this used to erroneously raise a TypeError'
+        SetSubclassWithKeywordArgs(newarg=1)
+
 class TestFrozenSet(TestJointOps):
     thetype = frozenset
 
@@ -1450,6 +1460,7 @@ def test_main(verbose=None):
     test_classes = (
         TestSet,
         TestSetSubclass,
+        TestSetSubclassWithKeywordArgs,        
         TestFrozenSet,
         TestFrozenSetSubclass,
         TestSetOfSets,
diff --git a/Objects/setobject.c b/Objects/setobject.c
@@ -1004,7 +1004,7 @@ frozenset_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
 	PyObject *iterable = NULL, *result;
 
-	if (!_PyArg_NoKeywords("frozenset()", kwds))
+	if (type == &PyFrozenSet_Type && !_PyArg_NoKeywords("frozenset()", kwds))
 		return NULL;
 
 	if (!PyArg_UnpackTuple(args, type->tp_name, 0, 1, &iterable))
@@ -1048,7 +1048,7 @@ PySet_Fini(void)
 static PyObject *
 set_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
-	if (!_PyArg_NoKeywords("set()", kwds))
+	if (type == &PySet_Type && !_PyArg_NoKeywords("set()", kwds))
 		return NULL;
 	
 	return make_new_set(type, NULL);

Original file line number	Diff line number	Diff line change
`@@ -1004,7 +1004,7 @@ frozenset_new(PyTypeObject type, PyObject args, PyObject *kwds)`
`1004`	`1004`	`{`
`1005`	`1005`	`PyObject iterable = NULL, result;`
`1006`	`1006`
`1007`		`- if (!_PyArg_NoKeywords("frozenset()", kwds))`
	`1007`	`+ if (type == &PyFrozenSet_Type && !_PyArg_NoKeywords("frozenset()", kwds))`
`1008`	`1008`	`return NULL;`
`1009`	`1009`
`1010`	`1010`	`if (!PyArg_UnpackTuple(args, type->tp_name, 0, 1, &iterable))`
`@@ -1048,7 +1048,7 @@ PySet_Fini(void)`
`1048`	`1048`	`static PyObject *`
`1049`	`1049`	`set_new(PyTypeObject type, PyObject args, PyObject *kwds)`
`1050`	`1050`	`{`
`1051`		`- if (!_PyArg_NoKeywords("set()", kwds))`
	`1051`	`+ if (type == &PySet_Type && !_PyArg_NoKeywords("set()", kwds))`
`1052`	`1052`	`return NULL;`
`1053`	`1053`
`1054`	`1054`	`return make_new_set(type, NULL);`