ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ka-Ping Yee <ping@lfw.org>:

Browse source 
Changes to error messages to increase consistency & clarity.

This (mostly) closes SourceForge patch #101839.
This commit is contained in:
Fred Drake 2000-10-24 19:57:45 +00:00
parent bd6f4fba1b
commit 661ea26b3d
16 changed files with 186 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Objects/moduleobject.c
View file

@ -163,13 +163,22 @@ static PyObject *
module_getattr(PyModuleObject *m, char *name)
{
PyObject *res;
char* modname;
if (strcmp(name, "__dict__") == 0) {
Py_INCREF(m->md_dict);
return m->md_dict;
}
res = PyDict_GetItemString(m->md_dict, name);
if (res == NULL)
PyErr_SetString(PyExc_AttributeError, name);
if (res == NULL) {
modname = PyModule_GetName((PyObject *)m);
if (modname == NULL) {
PyErr_Clear();
modname = "?";
}
PyErr_Format(PyExc_AttributeError,
"'%.50s' module has no attribute '%.400s'",
modname, name);
}
else
Py_INCREF(res);
return res;
@ -178,6 +187,7 @@ module_getattr(PyModuleObject *m, char *name)
static int
module_setattr(PyModuleObject *m, char *name, PyObject *v)
{
char* modname;
if (name[0] == '_' && strcmp(name, "__dict__") == 0) {
PyErr_SetString(PyExc_TypeError,
"read-only special attribute");
@ -185,9 +195,16 @@ module_setattr(PyModuleObject *m, char *name, PyObject *v)
}
if (v == NULL) {
int rv = PyDict_DelItemString(m->md_dict, name);
if (rv < 0)
PyErr_SetString(PyExc_AttributeError,
"delete non-existing module attribute");
if (rv < 0) {
modname = PyModule_GetName((PyObject *)m);
if (modname == NULL) {
PyErr_Clear();
modname = "?";
}
PyErr_Format(PyExc_AttributeError,
"'%.50s' module has no attribute '%.400s'",
modname, name);
}
return rv;
}
else