summaryrefslogtreecommitdiffstats
path: root/Objects/namespaceobject.c
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-05-22 08:02:49 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-05-22 08:02:49 (GMT)
commit08d230a5408e9fac3adbb357f5fb4a43958991d4 (patch)
tree94e66616cc67b6d1164d87f9bf694a6850b982ff /Objects/namespaceobject.c
parentdf9ba3623a1fcb745199b723ffd68e63f7a31153 (diff)
downloadcpython-08d230a5408e9fac3adbb357f5fb4a43958991d4.zip
cpython-08d230a5408e9fac3adbb357f5fb4a43958991d4.tar.gz
cpython-08d230a5408e9fac3adbb357f5fb4a43958991d4.tar.bz2
Issue #24257: Fixed incorrect uses of PyObject_IsInstance().
Fixed segmentation fault in sqlite3.Row constructor with faked cursor type. Fixed system error in the comparison of faked types.SimpleNamespace.
Diffstat (limited to 'Objects/namespaceobject.c')
-rw-r--r--Objects/namespaceobject.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/Objects/namespaceobject.c b/Objects/namespaceobject.c
index 720ac0d..3d27a95 100644
--- a/Objects/namespaceobject.c
+++ b/Objects/namespaceobject.c
@@ -164,12 +164,11 @@ namespace_clear(_PyNamespaceObject *ns)
static PyObject *
namespace_richcompare(PyObject *self, PyObject *other, int op)
{
- if (PyObject_IsInstance(self, (PyObject *)&_PyNamespace_Type) &&
- PyObject_IsInstance(other, (PyObject *)&_PyNamespace_Type))
+ if (PyObject_TypeCheck(self, &_PyNamespace_Type) &&
+ PyObject_TypeCheck(other, &_PyNamespace_Type))
return PyObject_RichCompare(((_PyNamespaceObject *)self)->ns_dict,
((_PyNamespaceObject *)other)->ns_dict, op);
- Py_INCREF(Py_NotImplemented);
- return Py_NotImplemented;
+ Py_RETURN_NOTIMPLEMENTED;
}