summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1990-10-14 20:03:32 (GMT)
committerGuido van Rossum <guido@python.org>1990-10-14 20:03:32 (GMT)
commit2b654f74c23de18c25a9e0b36979322ef461223c (patch)
treeaa52b4386765dfeee3727549f1f144b315dc0eb0
parent0539ba2c742d96b09922e9795086be1dc39c82a1 (diff)
downloadcpython-2b654f74c23de18c25a9e0b36979322ef461223c.zip
cpython-2b654f74c23de18c25a9e0b36979322ef461223c.tar.gz
cpython-2b654f74c23de18c25a9e0b36979322ef461223c.tar.bz2
New error handling in getattr().
-rw-r--r--Objects/fileobject.c3
-rw-r--r--Objects/moduleobject.c7
2 files changed, 5 insertions, 5 deletions
diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index 4879620..be4f300 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -9,6 +9,7 @@
#include "fileobject.h"
#include "methodobject.h"
#include "objimpl.h"
+#include "errors.h"
typedef struct {
OB_HEAD
@@ -248,7 +249,7 @@ filegetattr(f, name)
return newmethodobject(ml->ml_name, ml->ml_meth,
(object *)f);
}
- errno = ESRCH;
+ err_setstr(NameError, name);
return NULL;
}
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index 95dc094..7b9e0e9 100644
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -8,6 +8,7 @@
#include "dictobject.h"
#include "moduleobject.h"
#include "objimpl.h"
+#include "errors.h"
typedef struct {
OB_HEAD
@@ -94,10 +95,8 @@ modulegetattr(m, name)
char *name;
{
object *res = dictlookup(m->md_dict, name);
- if (res == NULL) {
- if (errno == ENOENT)
- errno = ESRCH;
- }
+ if (res == NULL)
+ err_setstr(NameError, name);
else
INCREF(res);
return res;