diff options
author | Stefano Rivera <github@rivera.za.net> | 2018-11-16 23:52:52 (GMT) |
---|---|---|
committer | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-11-16 23:52:52 (GMT) |
commit | 338d54f0a59dc5e5b6c9e7397340169f3a3f8ea4 (patch) | |
tree | cc5048b59a486301858b309e2b38ef265f0aff32 | |
parent | ad65f15581173542f1d2a9968a63bee272510ce3 (diff) | |
download | cpython-338d54f0a59dc5e5b6c9e7397340169f3a3f8ea4.zip cpython-338d54f0a59dc5e5b6c9e7397340169f3a3f8ea4.tar.gz cpython-338d54f0a59dc5e5b6c9e7397340169f3a3f8ea4.tar.bz2 |
bpo-28401: prevent Py_DEBUG builds from trying to import limited ABI modules (GH-1766)
[Issue 28401](https://bugs.python.org/issue28401): Don't attempt to import the stable API extensions, they are not supported in PyDEBUG builds (which don't implement that ABI).
https://bugs.python.org/issue28401
-rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2018-11-03-10-37-29.bpo-28401.RprDIg.rst | 3 | ||||
-rw-r--r-- | Python/dynload_shlib.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-11-03-10-37-29.bpo-28401.RprDIg.rst b/Misc/NEWS.d/next/Core and Builtins/2018-11-03-10-37-29.bpo-28401.RprDIg.rst new file mode 100644 index 0000000..8fbba78 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-11-03-10-37-29.bpo-28401.RprDIg.rst @@ -0,0 +1,3 @@ +Debug builds will no longer to attempt to import extension modules built +for the ABI as they were never compatible to begin with. +Patch by Stefano Rivera. diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c index feebd89..e5bddaa 100644 --- a/Python/dynload_shlib.c +++ b/Python/dynload_shlib.c @@ -38,7 +38,9 @@ const char *_PyImport_DynLoadFiletab[] = { ".dll", #else /* !__CYGWIN__ */ "." SOABI ".so", +#ifndef Py_DEBUG ".abi" PYTHON_ABI_STRING ".so", +#endif /* ! Py_DEBUG */ ".so", #endif /* __CYGWIN__ */ NULL, |