diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-01-03 22:16:32 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-01-03 22:16:32 (GMT) |
| commit | 000a074c955a1964959ee908300ef49b41170a06 (patch) | |
| tree | af32b732d8b3285969bd524a4af25b6533adbb4c /Python/errors.c | |
| parent | 0a83d79268e9d2b36decc78845cf71baced4ccc6 (diff) | |
| download | cpython-000a074c955a1964959ee908300ef49b41170a06.zip cpython-000a074c955a1964959ee908300ef49b41170a06.tar.gz cpython-000a074c955a1964959ee908300ef49b41170a06.tar.bz2 | |
Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0
Added a new API function PyImport_ImportModuleNoBlock. It solves the problem with dead locks when mixing threads and imports
Diffstat (limited to 'Python/errors.c')
| -rw-r--r-- | Python/errors.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/errors.c b/Python/errors.c index 63acf33..1c29160 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -690,7 +690,7 @@ PyErr_WarnExplicit(PyObject *category, const char *message, { PyObject *mod, *dict, *func = NULL; - mod = PyImport_ImportModule("warnings"); + mod = PyImport_ImportModuleNoBlock("warnings"); if (mod != NULL) { dict = PyModule_GetDict(mod); func = PyDict_GetItemString(dict, "warn_explicit"); |