diff options
| author |   Guido van Rossum <guido@python.org> | 1997-10-01 04:29:29 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1997-10-01 04:29:29 +0000 |
| commit | 0cb96de2699fa032ef1379ebb62a4dfb66ee5fde (patch) | |
| tree | 7c8fed41fb1b4ad5da7bb2fe8d0200e27c125561 /Modules/resource.c | |
| parent | Fix PYTHONPATH for new names; rename tkinter to lib-tk, rename win to (diff) | |
| download | cpython-0cb96de2699fa032ef1379ebb62a4dfb66ee5fde.tar.gz cpython-0cb96de2699fa032ef1379ebb62a4dfb66ee5fde.tar.bz2 cpython-0cb96de2699fa032ef1379ebb62a4dfb66ee5fde.zip | |
Apply two changes, systematically:
(1) Use PyErr_NewException("module.class", NULL, NULL) to create the
exception object.
(2) Remove all calls to Py_FatalError(); instead, return or
ignore the errors -- the import code now checks PyErr_Occurred()
after calling a module's init function, so it's no longer a
fatal error for the initialization to fail.
Also did some small cleanups, e.g. removed unnecessary test for
"already initialized" from initfpectl(), and unified
initposix()/initnt().
I haven't checked this very thoroughly, so while the changes are
pretty trivial -- beware of untested code!
Diffstat (limited to 'Modules/resource.c')
| -rw-r--r-- | Modules/resource.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Modules/resource.c b/Modules/resource.c index 428c32c03f8..9518ed61bf3 100644 --- a/Modules/resource.c +++ b/Modules/resource.c @@ -201,7 +201,7 @@ void initresource() /* Add some symbolic constants to the module */ d = PyModule_GetDict(m); - ResourceError = PyString_FromString("resource.error"); + ResourceError = PyErr_NewException("resource.error", NULL, NULL); PyDict_SetItemString(d, "error", ResourceError); /* insert constants */ @@ -264,8 +264,4 @@ void initresource() #ifdef RUSAGE_BOTH ins(d, "RUSAGE_BOTH", RUSAGE_BOTH); #endif - - /* Check for errors */ - if (PyErr_Occurred()) - Py_FatalError("can't initialize module resource"); } |