diff options
| author | Raymond Hettinger <python@rcn.com> | 2007-02-07 22:24:07 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2007-02-07 22:24:07 (GMT) |
| commit | 4da5bf644ab0aa836d29d076524c49cd9b6f3c03 (patch) | |
| tree | 26a725f7a7edb5a25eb1ddca722607d691115510 | |
| parent | 5a0217efeab4b6b2437a431e06d1c91f07548209 (diff) | |
| download | cpython-4da5bf644ab0aa836d29d076524c49cd9b6f3c03.zip cpython-4da5bf644ab0aa836d29d076524c49cd9b6f3c03.tar.gz cpython-4da5bf644ab0aa836d29d076524c49cd9b6f3c03.tar.bz2 | |
Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
| -rw-r--r-- | Lib/test/test_operator.py | 2 | ||||
| -rw-r--r-- | Objects/abstract.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/test_operator.py b/Lib/test/test_operator.py index c1fe88c..3cc0f1e 100644 --- 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/Objects/abstract.c b/Objects/abstract.c index 7115c52..7462c58 100644 --- 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; } |