mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Improve accuracy of sequence and mapping checks.

Browse source
This commit is contained in:
Raymond Hettinger 2004-04-04 08:51:41 +00:00
parent d12dfbbcd9
commit e2eda606a8
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Objects/abstract.c
View file

@ -1058,6 +1058,8 @@ PyNumber_Float(PyObject *o)
int
PySequence_Check(PyObject *s)
{
if (PyInstance_Check(s))
return PyObject_HasAttrString(s, "__getitem__");
return s != NULL && s->ob_type->tp_as_sequence &&
s->ob_type->tp_as_sequence->sq_item != NULL;
}
@ -1600,8 +1602,12 @@ PySequence_Index(PyObject *s, PyObject *o)
int
PyMapping_Check(PyObject *o)
{
return o && o->ob_type->tp_as_mapping &&
o->ob_type->tp_as_mapping->mp_subscript;
if (PyInstance_Check(o))
return PyObject_HasAttrString(o, "__getitem__");
return o && o->ob_type->tp_as_mapping &&
o->ob_type->tp_as_mapping->mp_subscript &&
!PyObject_HasAttrString(o, "__getslice__");
}
int