Issue #23757: Only call the concrete list API for exact lists.

rhettinger · rhettinger · commit 05aa839e4a3d · 2015-05-17T14:37:39.000-07:00
diff --git a/Lib/test/seq_tests.py b/Lib/test/seq_tests.py
@@ -84,6 +84,14 @@ def itermulti(seqn):
     'Test multiple tiers of iterators'
     return chain(imap(lambda x:x, iterfunc(IterGen(Sequence(seqn)))))
 
+class LyingTuple(tuple):
+    def __iter__(self):
+        yield 1
+
+class LyingList(list):
+    def __iter__(self):
+        yield 1
+
 class CommonTest(unittest.TestCase):
     # The type to be tested
     type2test = None
@@ -130,6 +138,10 @@ def __getitem__(self, i):
             self.assertRaises(TypeError, self.type2test, IterNoNext(s))
             self.assertRaises(ZeroDivisionError, self.type2test, IterGenExc(s))
 
+        # Issue #23757
+        self.assertEqual(self.type2test(LyingTuple((2,))), self.type2test((1,)))
+        self.assertEqual(self.type2test(LyingList([2])), self.type2test([1]))
+
     def test_truth(self):
         self.assertFalse(self.type2test())
         self.assertTrue(self.type2test([42]))
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -51,6 +51,9 @@ Core and Builtins
 
 - Issue #23971:  Fix underestimated presizing in dict.fromkeys().
 
+- Issue #23757:  PySequence_Tuple() incorrectly called the concrete list API
+  when the data was a list subclass.
+
 - Issue #20274: Remove ignored and erroneous "kwargs" parameters from three
   METH_VARARGS methods on _sqlite.Connection.
 
diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -2169,7 +2169,7 @@ PySequence_Tuple(PyObject *v)
         Py_INCREF(v);
         return v;
     }
-    if (PyList_Check(v))
+    if (PyList_CheckExact(v))
         return PyList_AsTuple(v);
 
     /* Get iterator. */

Original file line number	Diff line number	Diff line change
`@@ -2169,7 +2169,7 @@ PySequence_Tuple(PyObject *v)`
`2169`	`2169`	`Py_INCREF(v);`
`2170`	`2170`	`return v;`
`2171`	`2171`	`}`
`2172`		`- if (PyList_Check(v))`
	`2172`	`+ if (PyList_CheckExact(v))`
`2173`	`2173`	`return PyList_AsTuple(v);`
`2174`	`2174`
`2175`	`2175`	`/* Get iterator. */`