Add keyword arg support to itertools.compress().

rhettinger · rhettinger · commit 15a4950da1a8 · 2009-02-19T02:17:09.000Z
diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py
@@ -310,6 +310,7 @@ def test_combinatorics(self):
                 self.assertEqual(comb, sorted(set(cwr) & set(perm)))            # comb: both a cwr and a perm
 
     def test_compress(self):
+        self.assertEqual(list(compress(data='ABCDEF', selectors=[1,0,1,0,1,1])), list('ACEF'))
         self.assertEqual(list(compress('ABCDEF', [1,0,1,0,1,1])), list('ACEF'))
         self.assertEqual(list(compress('ABCDEF', [0,0,0,0,0,0])), list(''))
         self.assertEqual(list(compress('ABCDEF', [1,1,1,1,1,1])), list('ABCDEF'))
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
@@ -2607,11 +2607,9 @@ compress_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 	PyObject *seq1, *seq2;
 	PyObject *data=NULL, *selectors=NULL;
 	compressobject *lz;
-
-	if (type == &compress_type && !_PyArg_NoKeywords("compress()", kwds))
-		return NULL;
-
-	if (!PyArg_UnpackTuple(args, "compress", 2, 2, &seq1, &seq2))
+	static char *kwargs[] = {"data", "selectors", NULL};
+ 
+ 	if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO:compress", kwargs, &seq1, &seq2))
 		return NULL;
 
 	data = PyObject_GetIter(seq1);
@@ -2689,7 +2687,7 @@ compress_next(compressobject *lz)
 }
 
 PyDoc_STRVAR(compress_doc,
-"compress(data sequence, selector sequence) --> iterator over selected data\n\
+"compress(data, selectors) --> iterator over selected data\n\
 \n\
 Return data elements corresponding to true selector elements.\n\
 Forms a shorter iterator from selected data elements using the\n\
