diff Python/bltinmodule.c @ 14662:2d6188c2ea56 legacy-trunk

Deferred the attribute name object type checking to the underlying PyObject_Set/GetAttr() calls. This patch fixes bug #113829.
author Marc-André Lemburg <mal@egenix.com>
date Mon, 18 Sep 2000 16:22:27 +0000
parents 6f6f965c5e2d
children 85038a024b19
line wrap: on
line diff
--- a/Python/bltinmodule.c	Mon Sep 18 16:21:11 2000 +0000
+++ b/Python/bltinmodule.c	Mon Sep 18 16:22:27 2000 +0000
@@ -824,7 +824,7 @@
 	PyObject *v, *result, *dflt = NULL;
 	PyObject *name;
 
-	if (!PyArg_ParseTuple(args, "OS|O:getattr", &v, &name, &dflt))
+	if (!PyArg_ParseTuple(args, "OO|O:getattr", &v, &name, &dflt))
 		return NULL;
 	result = PyObject_GetAttr(v, name);
 	if (result == NULL && dflt != NULL) {
@@ -867,7 +867,7 @@
 	PyObject *v;
 	PyObject *name;
 
-	if (!PyArg_ParseTuple(args, "OS:hasattr", &v, &name))
+	if (!PyArg_ParseTuple(args, "OO:hasattr", &v, &name))
 		return NULL;
 	v = PyObject_GetAttr(v, name);
 	if (v == NULL) {
@@ -1076,7 +1076,7 @@
 	PyObject *name;
 	PyObject *value;
 
-	if (!PyArg_ParseTuple(args, "OSO:setattr", &v, &name, &value))
+	if (!PyArg_ParseTuple(args, "OOO:setattr", &v, &name, &value))
 		return NULL;
 	if (PyObject_SetAttr(v, name, value) != 0)
 		return NULL;
@@ -1097,7 +1097,7 @@
 	PyObject *v;
 	PyObject *name;
 
-	if (!PyArg_ParseTuple(args, "OS:delattr", &v, &name))
+	if (!PyArg_ParseTuple(args, "OO:delattr", &v, &name))
 		return NULL;
 	if (PyObject_SetAttr(v, name, (PyObject *)NULL) != 0)
 		return NULL;