| commit | d2f1db5355950fbad170b34750aff1c6074df949 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Wed Dec 28 12:01:51 2011 -0600 |
| committer | Benjamin Peterson <benjamin@python.org> | Wed Dec 28 12:01:51 2011 -0600 |
| tree | 94ba7887b9e66bc499e90d3ee618b328e24590d6 | |
| parent | 2199227be420a7dfbd2b6ae994088dc78bfbe422 [diff] | |
| parent | bbb0803924510a128ec095e47c97fda8406bcb74 [diff] |
merge heads
diff --git a/Objects/abstract.c b/Objects/abstract.c index 39f1a26..a44bec6 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c
@@ -1984,7 +1984,7 @@ int PyMapping_Check(PyObject *o) { - return o && o->ob_type->tp_as_mapping && + return o && o->ob_type->tp_as_mapping && o->ob_type->tp_as_mapping->mp_subscript; }