diff options
Diffstat (limited to 'Modules/resource.c')
| -rw-r--r-- | Modules/resource.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/Modules/resource.c b/Modules/resource.c index cadf9e6dff..b294a8cfe1 100644 --- a/Modules/resource.c +++ b/Modules/resource.c @@ -18,8 +18,6 @@ #define doubletime(TV) ((double)(TV).tv_sec + (TV).tv_usec * 0.000001) -static PyObject *ResourceError; - PyDoc_STRVAR(struct_rusage__doc__, "struct_rusage: Result from getrusage.\n\n" "This object may be accessed either as a tuple of\n" @@ -73,7 +71,7 @@ resource_getrusage(PyObject *self, PyObject *args) "invalid who parameter"); return NULL; } - PyErr_SetFromErrno(ResourceError); + PyErr_SetFromErrno(PyExc_OSError); return NULL; } @@ -125,7 +123,7 @@ resource_getrlimit(PyObject *self, PyObject *args) } if (getrlimit(resource, &rl) == -1) { - PyErr_SetFromErrno(ResourceError); + PyErr_SetFromErrno(PyExc_OSError); return NULL; } @@ -195,7 +193,7 @@ resource_setrlimit(PyObject *self, PyObject *args) PyErr_SetString(PyExc_ValueError, "not allowed to raise maximum limit"); else - PyErr_SetFromErrno(ResourceError); + PyErr_SetFromErrno(PyExc_OSError); goto error; } Py_DECREF(limits); @@ -263,12 +261,8 @@ PyInit_resource(void) return NULL; /* Add some symbolic constants to the module */ - if (ResourceError == NULL) { - ResourceError = PyErr_NewException("resource.error", - NULL, NULL); - } - Py_INCREF(ResourceError); - PyModule_AddObject(m, "error", ResourceError); + Py_INCREF(PyExc_OSError); + PyModule_AddObject(m, "error", PyExc_OSError); if (!initialized) PyStructSequence_InitType(&StructRUsageType, &struct_rusage_desc); |