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

This commit is contained in:
Raymond Hettinger 2007-02-07 22:24:07 +00:00
parent 5a0217efea
commit 4da5bf644a
2 changed files with 4 additions and 0 deletions

View File

@ -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)

View File

@ -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;
}