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 /Objects/unicodeobject.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 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 4241fe9..e3fc71a 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -2216,7 +2216,7 @@ PyObject *PyUnicode_DecodeUnicodeEscape(const char *s, if (ucnhash_CAPI == NULL) { /* load the unicode data module */ PyObject *m, *api; - m = PyImport_ImportModule("unicodedata"); + m = PyImport_ImportModuleNoBlock("unicodedata"); if (m == NULL) goto ucnhashError; api = PyObject_GetAttrString(m, "ucnhash_CAPI"); |