diff options
-rw-r--r-- | Misc/ACKS | 1 | ||||
-rw-r--r-- | Misc/NEWS | 3 | ||||
-rw-r--r-- | Modules/errnomodule.c | 23 |
3 files changed, 26 insertions, 1 deletions
@@ -14,6 +14,7 @@ and the list is in rough alphabetical order by last names. David Abrahams Jim Ahlstrom Farhan Ahmad +Matthew Ahrens Nir Aides Yaniv Aknin Jyrki Alakuijala @@ -63,6 +63,9 @@ Core and Builtins Extensions ---------- +- Issue #5737: Add Solaris-specific mnemonics in the errno module. Patch by + Matthew Ahrens. + - Restore GIL in nis_cat in case of error. - Issue #665761: ``functools.reduce()`` will no longer mask exceptions diff --git a/Modules/errnomodule.c b/Modules/errnomodule.c index 03c65f796d..19b8bd5bc7 100644 --- a/Modules/errnomodule.c +++ b/Modules/errnomodule.c @@ -82,7 +82,8 @@ PyInit_errno(void) /* * The names and comments are borrowed from linux/include/errno.h, - * which should be pretty all-inclusive + * which should be pretty all-inclusive. However, the Solaris specific + * names and comments are borrowed from sys/errno.h in Solaris. */ #ifdef ENODEV @@ -797,6 +798,26 @@ PyInit_errno(void) inscode(d, ds, de, "WSAN", WSAN, "Error WSAN"); #endif + /* Solaris-specific errnos */ +#ifdef ECANCELED + inscode(d, ds, de, "ECANCELED", ECANCELED, "Operation canceled"); +#endif +#ifdef ENOTSUP + inscode(d, ds, de, "ENOTSUP", ENOTSUP, "Operation not supported"); +#endif +#ifdef EOWNERDEAD + inscode(d, ds, de, "EOWNERDEAD", EOWNERDEAD, "Process died with the lock"); +#endif +#ifdef ENOTRECOVERABLE + inscode(d, ds, de, "ENOTRECOVERABLE", ENOTRECOVERABLE, "Lock is not recoverable"); +#endif +#ifdef ELOCKUNMAPPED + inscode(d, ds, de, "ELOCKUNMAPPED", ELOCKUNMAPPED, "Locked lock was unmapped"); +#endif +#ifdef ENOTACTIVE + inscode(d, ds, de, "ENOTACTIVE", ENOTACTIVE, "Facility is not active"); +#endif + Py_DECREF(de); return m; } |