summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-André Lemburg <mal@egenix.com>2003-02-14 20:25:56 (GMT)
committerMarc-André Lemburg <mal@egenix.com>2003-02-14 20:25:56 (GMT)
commit9cac1c4574877e06f5e5337ac34d6a5c93c73eb3 (patch)
tree3ad1e01bd51b84cc6b1c967f78e85bfb4f29c44d
parent117910dc445a2262bd96bbfefaf43714ae59c11b (diff)
downloadcpython-9cac1c4574877e06f5e5337ac34d6a5c93c73eb3.zip
cpython-9cac1c4574877e06f5e5337ac34d6a5c93c73eb3.tar.gz
cpython-9cac1c4574877e06f5e5337ac34d6a5c93c73eb3.tar.bz2
Patch for bug reported in patch #686627: import race condition in
codecs registry startup.
-rw-r--r--Python/codecs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/codecs.c b/Python/codecs.c
index ec0daf3..f987cd1 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -38,7 +38,7 @@ int import_encodings(void)
PyObject *mod;
import_encodings_called = 1;
- mod = PyImport_ImportModule("encodings");
+ mod = PyImport_ImportModuleEx("encodings", NULL, NULL, NULL);
if (mod == NULL) {
if (PyErr_ExceptionMatches(PyExc_ImportError)) {
/* Ignore ImportErrors... this is done so that