Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.

diff --git a/Lib/test/test_operator.py b/Lib/test/test_operator.py
index c1fe88cbef7fef862820cbf6863338ebc5dc5584..3cc0f1e837295d4f37b110c1a654727c1050ed62 100644 (file)
--- a/Lib/test/test_operator.py
+++ b/Lib/test/test_operator.py
@@ -215,6 +215,8 @@ class OperatorTestCase(unittest.TestCase):
         self.failUnless(operator.isSequenceType(xrange(10)))
         self.failUnless(operator.isSequenceType('yeahbuddy'))
         self.failIf(operator.isSequenceType(3))
+        class Dict(dict): pass
+        self.failIf(operator.isSequenceType(Dict()))
 
     def test_lshift(self):
         self.failUnlessRaises(TypeError, operator.lshift)

diff --git a/Misc/NEWS b/Misc/NEWS
index e628f4497928c41806506682ed0130565e3c0698..a24ec2675b4238a04799e612b3cd550b729ec488 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -103,6 +103,8 @@ Core and builtins
 Extension Modules
 -----------------
 
+- Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
+
 - collections.defaultdict() now verifies that the factory function is callable.
 
 - Bug #1486663: don't reject keyword arguments for subclasses of builtin

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 7115c523c2daa417eaf5c787db5bbc2295145d0f..7462c58deca1ac9e979c3a562eef2b2506d6566d 100644 (file)
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1157,6 +1157,8 @@ PySequence_Check(PyObject *s)
 {
        if (s && PyInstance_Check(s))
                return PyObject_HasAttrString(s, "__getitem__");
+       if (PyObject_IsInstance(s, &PyDict_Type))
+               return 0;
        return s != NULL && s->ob_type->tp_as_sequence &&
                s->ob_type->tp_as_sequence->sq_item != NULL;
 }