From 302b54acd91f999c039f9a3618f734dbdfb74467 Mon Sep 17 00:00:00 2001 From: Jeremy Hylton Date: Mon, 30 Jul 2001 22:45:19 +0000 Subject: [PATCH] Do for hasattr() what was done for getattr() Namely, an exception is raised if the second arg to hasattr() is not a string or Unicode. --- Python/bltinmodule.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 571cfe2c8a..ec55928ccc 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -944,6 +944,17 @@ builtin_hasattr(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "OO:hasattr", &v, &name)) return NULL; + if (PyUnicode_Check(name)) { + name = _PyUnicode_AsDefaultEncodedString(name, NULL); + if (name == NULL) + return NULL; + } + + if (!PyString_Check(name)) { + PyErr_SetString(PyExc_TypeError, + "attribute name must be string"); + return NULL; + } v = PyObject_GetAttr(v, name); if (v == NULL) { PyErr_Clear(); -- 2.49.0