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 /Modules/parsermodule.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 'Modules/parsermodule.c')
| -rw-r--r-- | Modules/parsermodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c index 6c4a6ad..5764c24 100644 --- a/Modules/parsermodule.c +++ b/Modules/parsermodule.c @@ -3269,7 +3269,7 @@ initparser(void) * If this fails, the import of this module will fail because an * exception will be raised here; should we clear the exception? */ - copyreg = PyImport_ImportModule("copy_reg"); + copyreg = PyImport_ImportModuleNoBlock("copy_reg"); if (copyreg != NULL) { PyObject *func, *pickler; |